diff options
| author | drh <drh@noemail.net> | 2018-12-06 16:50:55 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2018-12-06 16:50:55 +0000 |
| commit | 70d5dfba687ac41bf79d30198f7dd3d58cb6645e (patch) | |
| tree | d3f3ef935cbba442a82c91d32a1e7cd68b9c72d7 /src | |
| parent | ec8fc62c42902496b3955c7447f865a6142edfeb (diff) | |
| download | sqlite-70d5dfba687ac41bf79d30198f7dd3d58cb6645e.tar.gz sqlite-70d5dfba687ac41bf79d30198f7dd3d58cb6645e.zip | |
When saving off the value of sqlite3.flags, take care to preserve all 64
bits.
FossilOrigin-Name: 9c6dbcfab5952cf4e54de30cf9cee48f988b91a35dc3f04d64d6d994dd84a076
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.c | 2 | ||||
| -rw-r--r-- | src/select.c | 2 | ||||
| -rw-r--r-- | src/vacuum.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/main.c b/src/main.c index aa4546684..a4049f23f 100644 --- a/src/main.c +++ b/src/main.c @@ -843,7 +843,7 @@ int sqlite3_db_config(sqlite3 *db, int op, ...){ if( aFlagOp[i].op==op ){ int onoff = va_arg(ap, int); int *pRes = va_arg(ap, int*); - u32 oldFlags = db->flags; + u64 oldFlags = db->flags; if( onoff>0 ){ db->flags |= aFlagOp[i].mask; }else if( onoff==0 ){ diff --git a/src/select.c b/src/select.c index c60ff2700..68f2c9f62 100644 --- a/src/select.c +++ b/src/select.c @@ -2077,7 +2077,7 @@ void sqlite3SelectAddColumnTypeAndCollation( Table *sqlite3ResultSetOfSelect(Parse *pParse, Select *pSelect){ Table *pTab; sqlite3 *db = pParse->db; - int savedFlags; + u64 savedFlags; savedFlags = db->flags; db->flags &= ~SQLITE_FullColNames; diff --git a/src/vacuum.c b/src/vacuum.c index 5fb048916..5017dbffd 100644 --- a/src/vacuum.c +++ b/src/vacuum.c @@ -136,8 +136,8 @@ int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db, int iDb){ int rc = SQLITE_OK; /* Return code from service routines */ Btree *pMain; /* The database being vacuumed */ Btree *pTemp; /* The temporary database we vacuum into */ - u16 saved_mDbFlags; /* Saved value of db->mDbFlags */ - u32 saved_flags; /* Saved value of db->flags */ + u32 saved_mDbFlags; /* Saved value of db->mDbFlags */ + u64 saved_flags; /* Saved value of db->flags */ int saved_nChange; /* Saved value of db->nChange */ int saved_nTotalChange; /* Saved value of db->nTotalChange */ u8 saved_mTrace; /* Saved trace settings */ |