From: drh Date: Thu, 14 Jan 2010 00:39:26 +0000 (+0000) Subject: Comment cleanup in sqliteInt.h. X-Git-Tag: version-3.7.2~637 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a2460e073012c47a43ecde51176b5165fa265ff3;p=thirdparty%2Fsqlite.git Comment cleanup in sqliteInt.h. FossilOrigin-Name: 67c3aea563e019083f0ed87b57982a0379637d4f --- diff --git a/manifest b/manifest index f89176e073..5d5a142462 100644 --- a/manifest +++ b/manifest @@ -1,8 +1,8 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -C Make\sthe\ssqlite3IsNaN()\sfunction\sa\smacro\sthat\sevaluates\sto\sFALSE\swhen\ncompiled\swith\sSQLITE_OMIT_FLOATING_POINT. -D 2010-01-13T17:39:54 +C Comment\scleanup\sin\ssqliteInt.h. +D 2010-01-14T00:39:26 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -169,7 +169,7 @@ F src/select.c 0109b993c360d649857523abb72919e1794f9b45 F src/shell.c b95c5fcfe458027f192914a47474652969a1ec0f F src/sqlite.h.in d493cf5029de67fe7252324473d89140a007a6c4 F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89 -F src/sqliteInt.h 02d9bef4b1b0ac4591b4b21eb8cc088da98efb4d +F src/sqliteInt.h 84b20b8be124b9c1d4abfd79208710febba382fa F src/sqliteLimit.h 3afab2291762b5d09ae20c18feb8e9fa935a60a6 F src/status.c e651be6b30d397d86384c6867bc016e4913bcac7 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e @@ -788,14 +788,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 3fd6f9ad06b786116ca18c1e812363d30cd3060e -R 9c4726b877b18c84b124339d8c77faa9 +P 56f232d562bc239103a5afd2e64c4b926a20de08 +R 3b331cd0e95e4d69ff5c9f9bfafab8bd U drh -Z 07d8356cf770ce4fd434801b14df39ef +Z b5abd666e8f857d795728a3a90d182a6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFLTgVtoxKgR168RlERAk1KAJ9dMLQYGS22KQsh7/jad4TrbBhjmgCeJ8lU -1peDSTkv+y/ya8z6lODMkI8= -=6Wje +iD8DBQFLTmfWoxKgR168RlERAikxAJ9Wj+u6555vXm+xBTOR0LRgevvzlQCcDtL6 +h1OBnqJI6Rk9bG44HfgzbwU= +=19E+ -----END PGP SIGNATURE----- diff --git a/manifest.uuid b/manifest.uuid index ff97b61ead..e643c78d32 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -56f232d562bc239103a5afd2e64c4b926a20de08 \ No newline at end of file +67c3aea563e019083f0ed87b57982a0379637d4f \ No newline at end of file diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 060b0d7ffc..dd1d7c50e0 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -76,6 +76,11 @@ #include #endif +/* +** The number of samples of an index that SQLite takes in order to +** construct a histogram of the table content when running ANALYZE +** and with SQLITE_ENABLE_STAT2 +*/ #define SQLITE_INDEX_SAMPLES 10 /* @@ -140,23 +145,18 @@ ** ** SQLITE_SYSTEM_MALLOC // Use normal system malloc() ** SQLITE_MEMDEBUG // Debugging version of system malloc() -** SQLITE_MEMORY_SIZE // internal allocator #1 -** SQLITE_MMAP_HEAP_SIZE // internal mmap() allocator -** SQLITE_POW2_MEMORY_SIZE // internal power-of-two allocator +** +** (Historical note: There used to be several other options, but we've +** pared it down to just these two.) ** ** If none of the above are defined, then set SQLITE_SYSTEM_MALLOC as ** the default. */ -#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+\ - defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+\ - defined(SQLITE_POW2_MEMORY_SIZE)>1 +#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)>1 # error "At most one of the following compile-time configuration options\ - is allows: SQLITE_SYSTEM_MALLOC, SQLITE_MEMDEBUG, SQLITE_MEMORY_SIZE,\ - SQLITE_MMAP_HEAP_SIZE, SQLITE_POW2_MEMORY_SIZE" + is allows: SQLITE_SYSTEM_MALLOC, SQLITE_MEMDEBUG" #endif -#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+\ - defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+\ - defined(SQLITE_POW2_MEMORY_SIZE)==0 +#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)==0 # define SQLITE_SYSTEM_MALLOC 1 #endif @@ -328,20 +328,6 @@ #define OMIT_TEMPDB 0 #endif -/* -** If the following macro is set to 1, then NULL values are considered -** distinct when determining whether or not two entries are the same -** in a UNIQUE index. This is the way PostgreSQL, Oracle, DB2, MySQL, -** OCELOT, and Firebird all work. The SQL92 spec explicitly says this -** is the way things are suppose to work. -** -** If the following macro is set to 0, the NULLs are indistinct for -** a UNIQUE index. In this mode, you can only have a single NULL entry -** for a column declared UNIQUE. This is the way Informix and SQL Server -** work. -*/ -#define NULL_DISTINCT_FOR_UNIQUE 1 - /* ** The "file format" number is an integer that is incremented whenever ** the VDBE-level file format changes. The following macros define the @@ -353,6 +339,10 @@ # define SQLITE_DEFAULT_FILE_FORMAT 1 #endif +/* +** Determine whether triggers are recursive by default. This can be +** changed at run-time using a pragma. +*/ #ifndef SQLITE_DEFAULT_RECURSIVE_TRIGGERS # define SQLITE_DEFAULT_RECURSIVE_TRIGGERS 0 #endif @@ -597,7 +587,6 @@ typedef struct AggInfo AggInfo; typedef struct AuthContext AuthContext; typedef struct AutoincInfo AutoincInfo; typedef struct Bitvec Bitvec; -typedef struct RowSet RowSet; typedef struct CollSeq CollSeq; typedef struct Column Column; typedef struct Db Db; @@ -618,6 +607,7 @@ typedef struct LookasideSlot LookasideSlot; typedef struct Module Module; typedef struct NameContext NameContext; typedef struct Parse Parse; +typedef struct RowSet RowSet; typedef struct Savepoint Savepoint; typedef struct Select Select; typedef struct SrcList SrcList; @@ -625,9 +615,9 @@ typedef struct StrAccum StrAccum; typedef struct Table Table; typedef struct TableLock TableLock; typedef struct Token Token; +typedef struct Trigger Trigger; typedef struct TriggerPrg TriggerPrg; typedef struct TriggerStep TriggerStep; -typedef struct Trigger Trigger; typedef struct UnpackedRecord UnpackedRecord; typedef struct VTable VTable; typedef struct Walker Walker; @@ -693,7 +683,7 @@ struct Schema { /* ** These macros can be used to test, set, or clear bits in the -** Db.flags field. +** Db.pSchema->flags field. */ #define DbHasProperty(D,I,P) (((D)->aDb[I].pSchema->flags&(P))==(P)) #define DbHasAnyProperty(D,I,P) (((D)->aDb[I].pSchema->flags&(P))!=0) @@ -701,7 +691,7 @@ struct Schema { #define DbClearProperty(D,I,P) (D)->aDb[I].pSchema->flags&=~(P) /* -** Allowed values for the DB.flags field. +** Allowed values for the DB.pSchema->flags field. ** ** The DB_SchemaLoaded flag is set after the database schema has been ** read into internal hash tables. @@ -765,7 +755,7 @@ struct FuncDefHash { }; /* -** Each database is an instance of the following structure. +** Each database connection is an instance of the following structure. ** ** The sqlite.lastRowid records the last insert rowid generated by an ** insert statement. Inserts on views do not affect its value. Each