When resetting any non-TEMP schema, also reset the TEMP schema since it might

be holding references to the non-TEMP schema that just got reset.

FossilOrigin-Name: 211d5dde1f9c15048c65d1d700141aa7b2491011

diff --git a/manifest b/manifest
index 2df976638088053f82e06c8745d4253872e1ec86..6eb669650b3869ded123c3f2db17b8fef599f575 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Begin\sa\sseries\sof\schanges\sdesigned\sto\sreduce\sthe\sscope\sand\sfrequency\sof\ninvalidating\sschemas.\s\sDesign\sgoals\sare\sthat\sthe\sinternal\sschema\sshould\nnever\sbe\sdeleted\sout\sfrom\sunder\sa\sprepared\sstatement\sthat\sis\srunning\sand\nthat\sall\sprepared\sstatements\sshould\sbe\sexpired\sif\sthe\sschema\sis\sinvalidated.\nAt\sthe\ssame\stime,\sminimize\sthe\snumber\sof\sschema\sinvalidations.\s\sThis\schange\nmerely\srevises\sthe\ssqlite3ResetInternalSchema()\sfunction\sto\suse\s-1\sas\sthe\nwildcard\sfor\s"all"\srather\sthan\s0,\sso\sthat\swe\scan\sreset\sthe\smain\sschema\nindependently\sof\sall\sthe\sothers.
-D 2011-04-02T16:28:52.034
+C When\sresetting\sany\snon-TEMP\sschema,\salso\sreset\sthe\sTEMP\sschema\ssince\sit\smight\nbe\sholding\sreferences\sto\sthe\snon-TEMP\sschema\sthat\sjust\sgot\sreset.
+D 2011-04-02T16:50:25.018
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -124,7 +124,7 @@ F src/btmutex.c 96a12f50f7a17475155971a241d85ec5171573ff
 F src/btree.c 2b9c81ff64da339a67dda4f94c0d763627be0b67
 F src/btree.h 8d36f774ec4b1d0027b8966f8c03d9a72a518c14
 F src/btreeInt.h 20f73dc93b1eeb83afd7259fbc6bd7dcf2df7fe4
-F src/build.c 9dca3dc000b85753cff822c69151f88d913f3b3e
+F src/build.c fcdd8f47361261432fb10d0e7234ba617025d1f2
 F src/callback.c 5069f224882cbdccd559f591271d28d7f37745bc
 F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
 F src/ctime.c 52ff72f966cee3087e0138a3ec69371c22be3c01
@@ -926,11 +926,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 71a799b02a3b3cf2e12758dea29fd2465bbec3e1
-R 5fca8a4df9fe5cb6d589b9d60d83b4fc
-T *bgcolor * #d3a8bc
-T *branch * schema-parse-refactor
-T *sym-schema-parse-refactor *
-T -sym-trunk *
+P 6a8ad6e31e0d2b8a5ace38faf0efd805155ee5f3
+R bc8973ff15cc98898e96282e6b2f93e3
 U drh
-Z 80e5b841d301ef316c4772ca966c9795
+Z af325c6ab15f4448779a96c9a9fe8dd3

diff --git a/manifest.uuid b/manifest.uuid
index 8ad8e8fd350a4b16525cd472d3ca00ea1b1a930f..d2609b2f9d88109e4b23e4d57e4b633244ab2f8f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6a8ad6e31e0d2b8a5ace38faf0efd805155ee5f3
\ No newline at end of file
+211d5dde1f9c15048c65d1d700141aa7b2491011
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index c7cd6363d9b1823574b0057857e04f8d02e2887c..7c4735c063f74c3f8b7626caa054413c9ab966c0 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -408,6 +408,13 @@ void sqlite3ResetInternalSchema(sqlite3 *db, int iDb){
       assert(iDb==1 || (pDb->pBt && sqlite3BtreeHoldsMutex(pDb->pBt)));
       sqlite3SchemaFree(pDb->pSchema);
     }
+    /* If any database other than TEMP is reset, then also reset TEMP
+    ** since TEMP might be holding triggers that reference tables in the
+    ** other database.
+    */
+    if( iDb!=1 && (pDb = &db->aDb[1])!=0 && pDb->pSchema ){
+      sqlite3SchemaFree(pDb->pSchema);
+    }
     return;
   }
   /* Case 2 (from here to the end): Reset all schemas for all attached