Remove additional traces (mostly in comments) of the Table.dbMem field.

FossilOrigin-Name: 5c58f44aeb224e106497368d9290d75a08807761

diff --git a/manifest b/manifest
index f776d6b85315c6774c65d14cb77f0d86c2b7d710..7b151333716dcaa346c3aaae5ce7d85037af701d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Remove\sthe\sTable.dbMem\svariable,\sas\sit\sis\sno\slonger\sbeing\sused\sfor\sits\soriginal\spurpose.
-D 2010-07-23T15:41:47
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Remove\sadditional\straces\s(mostly\sin\scomments)\sof\sthe\sTable.dbMem\sfield.
+D 2010-07-23T17:06:32
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -117,14 +120,14 @@ F src/btree.c 9a214e6141555b183216b73ace058c7a499cdbe2
 F src/btree.h dd83041eda10c17daf023257c1fc883b5f71f85a
 F src/btreeInt.h b0c87f6725b06a0aa194a6d25d54b16ce9d6e291
 F src/build.c 8ccdb8ff8e86cbf5b891d4b236e50a91e69732d3
-F src/callback.c 907455fa24d0bf34a5929609d3deceff9f9d9ba0
+F src/callback.c 4e565b7f387e3261a19ecaf0cbbdebfb91988ea4
 F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
 F src/ctime.c 4f3aadad62c6c9f0d4e5a96718516ac4e3c598df
 F src/date.c 5dd8448a0bfea8d31fb14cff487d0c06ff8c8b20
 F src/delete.c 7ed8a8c8b5f748ece92df173d7e0f7810c899ebd
 F src/expr.c 7490fc3b16414d1a45d5acadf559317f9244891f
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
-F src/fkey.c 31b8dc8e73a9d87b4a546f5372146b84f99ef2d4
+F src/fkey.c 62eed881a26a93e576b8cfeedea91952c90a8666
 F src/func.c 0c28599430856631216b6c0131c51c89bf516026
 F src/global.c 02335177cf6946fe5525c6f0755cf181140debf3
 F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
@@ -168,7 +171,7 @@ F src/printf.c 5f5b65a83e63f2096a541a340722a509fa0240a7
 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
-F src/select.c 3437b62b225528eef9cb61858584e86bb74ab35d
+F src/select.c 74fef1334bec27e606ef0b19e5c41cd0a639e69c
 F src/shell.c fd4ccdb37c3b68de0623eb938a649e0990710714
 F src/sqlite.h.in 2585fc82c922f2772e201e60a76d5fd1ca18370e
 F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
@@ -838,7 +841,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 430be657be68687c998f2f5f8dcd112bf26106be
-R b12985159a737efd8ea9a2927ba836e0
-U dan
-Z 048b116055cce95a3e484c5c3be793ac
+P 6eddc6e601cf8f585c6c2cf79f36fcbfe98a307e
+R f717f36084ea9a87f741a9b13ed6b688
+U drh
+Z 1d2dd398ba20f5074351d2d5fe9e494c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFMScwboxKgR168RlERArt/AKCEG8hSMTg2C7Q9TxP/W8/julag/wCdEnuB
+uHRKBHei+vBtpU8kzB8UnBg=
+=E6Pn
+-----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index e2cdd057619deca1cb764fe0e8ee6ee44357c923..776a0975f7b08b9ae7123688899fcd949f15599a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6eddc6e601cf8f585c6c2cf79f36fcbfe98a307e
\ No newline at end of file
+5c58f44aeb224e106497368d9290d75a08807761
\ No newline at end of file

diff --git a/src/callback.c b/src/callback.c
index 01b292b381d99842f2c42c5b41525f5f830c6d08..f8918bcf1bce01b41e8b6ea900403c45d2f7d963 100644 (file)
--- a/src/callback.c
+++ b/src/callback.c
@@ -422,7 +422,6 @@ void sqlite3SchemaFree(void *p){
   sqlite3HashInit(&pSchema->tblHash);
   for(pElem=sqliteHashFirst(&temp1); pElem; pElem=sqliteHashNext(pElem)){
     Table *pTab = sqliteHashData(pElem);
-    assert( pTab->dbMem==0 );
     sqlite3DeleteTable(0, pTab);
   }
   sqlite3HashClear(&temp1);

diff --git a/src/fkey.c b/src/fkey.c
index ea71f49aa99e8848f87d3ff7176b78b76fa54a17..217badffa7ad0ceb76bec08fd0f20a8b3334c4ae 100644 (file)
--- a/src/fkey.c
+++ b/src/fkey.c
@@ -1061,11 +1061,7 @@ static Trigger *fkActionTrigger(
       pWhere = 0;
     }
 
-    /* In the current implementation, pTab->dbMem==0 for all tables except
-    ** for temporary tables used to describe subqueries.  And temporary
-    ** tables do not have foreign key constraints.  Hence, pTab->dbMem
-    ** should always be 0 there.
-    */
+    /* Disable lookaside memory allocation */
     enableLookaside = db->lookaside.bEnabled;
     db->lookaside.bEnabled = 0;
 

diff --git a/src/select.c b/src/select.c
index 3008276a78734d10e5642505543ed974b4f5e6e8..b3aa3d7ca2bba57ba895d2a79023b7848a0a3485 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -1298,7 +1298,7 @@ Table *sqlite3ResultSetOfSelect(Parse *pParse, Select *pSelect){
     return 0;
   }
   /* The sqlite3ResultSetOfSelect() is only used n contexts where lookaside
-  ** is disabled, so we might as well hard-code pTab->dbMem to NULL. */
+  ** is disabled */
   assert( db->lookaside.bEnabled==0 );
   pTab->nRef = 1;
   pTab->zName = 0;