diff options
| author | danielk1977 <danielk1977@noemail.net> | 2006-01-11 14:09:31 +0000 |
|---|---|---|
| committer | danielk1977 <danielk1977@noemail.net> | 2006-01-11 14:09:31 +0000 |
| commit | b82e7edae9c6f8b0c9f2f6745442b5663a55b51a (patch) | |
| tree | c388bb764973fcc40e8812c26ed450e7288a9c45 /src/build.c | |
| parent | 003437a0a7563fddadb95d4103630da3a9d7f2ae (diff) | |
| download | sqlite-b82e7edae9c6f8b0c9f2f6745442b5663a55b51a.tar.gz sqlite-b82e7edae9c6f8b0c9f2f6745442b5663a55b51a.zip | |
Fix bugs caused by assuming that shared-schemas are initialized. (CVS 2917)
FossilOrigin-Name: 3970eb875d1830d35b3a70a7583a8ab6b238cad6
Diffstat (limited to 'src/build.c')
| -rw-r--r-- | src/build.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/build.c b/src/build.c index e7c1742e2..65ce2e533 100644 --- a/src/build.c +++ b/src/build.c @@ -22,7 +22,7 @@ ** COMMIT ** ROLLBACK ** -** $Id: build.c,v 1.375 2006/01/10 17:58:23 danielk1977 Exp $ +** $Id: build.c,v 1.376 2006/01/11 14:09:32 danielk1977 Exp $ */ #include "sqliteInt.h" #include <ctype.h> @@ -255,7 +255,6 @@ Table *sqlite3FindTable(sqlite3 *db, const char *zName, const char *zDatabase){ Table *p = 0; int i; assert( zName!=0 ); - assert( (db->flags & SQLITE_Initialized) || db->init.busy ); for(i=OMIT_TEMPDB; i<db->nDb; i++){ int j = (i<2) ? i^1 : i; /* Search TEMP before MAIN */ if( zDatabase!=0 && sqlite3StrICmp(zDatabase, db->aDb[j].zName) ) continue; @@ -311,7 +310,6 @@ Table *sqlite3LocateTable(Parse *pParse, const char *zName, const char *zDbase){ Index *sqlite3FindIndex(sqlite3 *db, const char *zName, const char *zDb){ Index *p = 0; int i; - assert( (db->flags & SQLITE_Initialized) || db->init.busy ); for(i=OMIT_TEMPDB; i<db->nDb; i++){ int j = (i<2) ? i^1 : i; /* Search TEMP before MAIN */ Schema *pSchema = db->aDb[j].pSchema; @@ -393,7 +391,6 @@ void sqlite3ResetInternalSchema(sqlite3 *db, int iDb){ int i, j; assert( iDb>=0 && iDb<db->nDb ); - db->flags &= ~SQLITE_Initialized; for(i=iDb; i<db->nDb; i++){ Db *pDb = &db->aDb[i]; if( pDb->pSchema ){ |