diff options
| author | danielk1977 <danielk1977@noemail.net> | 2006-01-09 16:12:04 +0000 |
|---|---|---|
| committer | danielk1977 <danielk1977@noemail.net> | 2006-01-09 16:12:04 +0000 |
| commit | 14db26653ab6cc7fd24a7b4c77596e843b40bee0 (patch) | |
| tree | 6495699ed421636be27f583008e99c7b02bb0775 /src/sqliteInt.h | |
| parent | 52622828ce62688382404e237179f188fc46b06d (diff) | |
| download | sqlite-14db26653ab6cc7fd24a7b4c77596e843b40bee0.tar.gz sqlite-14db26653ab6cc7fd24a7b4c77596e843b40bee0.zip | |
Fix some errors to do with attached databases and text encodings in shared-cache mode. (CVS 2895)
FossilOrigin-Name: 3e75d3d5efebc0dfff1adfc13d85e85ec39db3eb
Diffstat (limited to 'src/sqliteInt.h')
| -rw-r--r-- | src/sqliteInt.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 4ac590b94..a24ad3352 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -11,7 +11,7 @@ ************************************************************************* ** Internal interface definitions for SQLite. ** -** @(#) $Id: sqliteInt.h,v 1.455 2006/01/09 09:59:49 danielk1977 Exp $ +** @(#) $Id: sqliteInt.h,v 1.456 2006/01/09 16:12:05 danielk1977 Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ @@ -382,7 +382,6 @@ struct Db { Btree *pBt; /* The B*Tree structure for this database file */ u8 inTrans; /* 0: not writable. 1: Transaction. 2: Checkpoint */ u8 safety_level; /* How aggressive at synching data to disk */ - int cache_size; /* Number of pages to use in the cache */ void *pAux; /* Auxiliary data. Usually NULL */ void (*xFreeAux)(void*); /* Routine to free pAux */ Schema *pSchema; /* Pointer to database schema (possibly shared) */ @@ -400,6 +399,8 @@ struct Schema { Table *pSeqTab; /* The sqlite_sequence table used by AUTOINCREMENT */ u8 file_format; /* Schema format version for this file */ u16 flags; /* Flags associated with this schema */ + int cache_size; /* Number of pages to use in the cache */ + u8 enc; /* Text encoding used by this database */ }; /* @@ -457,7 +458,6 @@ struct sqlite3 { Db *aDb; /* All backends */ int flags; /* Miscellanous flags. See below */ int errCode; /* Most recent error code (SQLITE_*) */ - u8 enc; /* Text encoding for this database. */ u8 autoCommit; /* The auto-commit flag. */ u8 temp_store; /* 1: file 2: memory 0: default */ int nTable; /* Number of tables in the database */ @@ -513,6 +513,8 @@ struct sqlite3 { #endif }; +#define ENC(db) ((db)->aDb[0].pSchema->enc) + /* ** Possible values for the sqlite.flags and or Db.flags fields. ** |