The KeyInfo cache must be cleared before closing the btree, not after.

Revised fix for ticket [e4a18565a36884b00edf].

FossilOrigin-Name: 48529508cfe2f9445a6940222fe5ff7cc92aef78

diff --git a/manifest b/manifest
index 39735c3e12ce5163569ad70b5b33f1124ba8f2a6..b71864db0451b3c11d235bf9bbbff25ed25e2bc0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Increase\sthe\sversion\snumber\sto\s3.8.7.3.
-D 2014-12-05T14:54:28.400
+C The\sKeyInfo\scache\smust\sbe\scleared\sbefore\sclosing\sthe\sbtree,\snot\safter.\nRevised\sfix\sfor\sticket\s[e4a18565a36884b00edf].
+D 2014-12-05T15:25:49.142
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -194,7 +194,7 @@ F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
 F src/loadext.c de741e66e5ddc1598d904d7289239696e40ed994
-F src/main.c da87f93489c8e71d5b876b60a673b5c50bd3836b
+F src/main.c aefdbda97a8d88ffeb6c49fd72d5757a7e813594
 F src/malloc.c 3c3ac67969612493d435e14b6832793209afd2ec
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
@@ -1206,7 +1206,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P b7905b8c5fe266f43c99a44c6b9aa4b56b2ba4d1
-R b112ba624d7674e921fd6217334e2c92
+P 9f7560bc453f55570eb67e1a03359f0133d66d99
+R c773f0f4ea9c118e2f2d4aca4c769c11
 U drh
-Z 821726a8f3aa512d6cdf73b2a14e0313
+Z 52f033891643ac2d92ef4238fb238551

diff --git a/manifest.uuid b/manifest.uuid
index 7ef5d47925834b40804630c05eb6bd874385b6fe..fd74438f996dca235cea9e4f387a91889fcb506e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9f7560bc453f55570eb67e1a03359f0133d66d99
\ No newline at end of file
+48529508cfe2f9445a6940222fe5ff7cc92aef78
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 45d03c2668ea0682c610d75c98578fcfb355a62b..8b404068246e9ab8657b8f7e9154f7ea58d57a44 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -930,15 +930,17 @@ void sqlite3LeaveMutexAndCloseZombie(sqlite3 *db){
   for(j=0; j<db->nDb; j++){
     struct Db *pDb = &db->aDb[j];
     if( pDb->pBt ){
-      sqlite3BtreeClose(pDb->pBt);
-      pDb->pBt = 0;
-      if( j!=1 && pDb->pSchema ){
+      if( pDb->pSchema ){
         /* Must clear the KeyInfo cache.  See ticket [e4a18565a36884b00edf] */
         for(i=sqliteHashFirst(&pDb->pSchema->idxHash); i; i=sqliteHashNext(i)){
           Index *pIdx = sqliteHashData(i);
           sqlite3KeyInfoUnref(pIdx->pKeyInfo);
           pIdx->pKeyInfo = 0;
         }
+      }
+      sqlite3BtreeClose(pDb->pBt);
+      pDb->pBt = 0;
+      if( j!=1 ){
         pDb->pSchema = 0;
       }
     }