]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
The KeyInfo cache must be cleared before closing the btree, not after.
authordrh <drh@noemail.net>
Fri, 5 Dec 2014 15:31:33 +0000 (15:31 +0000)
committerdrh <drh@noemail.net>
Fri, 5 Dec 2014 15:31:33 +0000 (15:31 +0000)
Revised fix for ticket [e4a18565a36884b00edf].

FossilOrigin-Name: 7ed3346e8c10dbf52fd44ab69900699d4f7ad3fd

manifest
manifest.uuid
src/main.c

index 14a2b2330669a5a8de94fb3bb26a64823c4c279d..fd3e0c5784a7b9ae6dac5a0e76a15766c6419b54 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\sclosing\sa\s(shared-cache)\sdatabase\sconnection,\sbe\ssure\sto\sclear\sout\nall\sKeyInfo\sobjects\scached\son\sIndex\sobjects.\s\nFix\sfor\sticket\s[e4a18565a36884b00edf].
-D 2014-12-05T14:44:57.022
+C The\sKeyInfo\scache\smust\sbe\scleared\sbefore\sclosing\sthe\sbtree,\snot\safter.\nRevised\sfix\sfor\sticket\s[e4a18565a36884b00edf].
+D 2014-12-05T15:31:33.761
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 6c4f961fa91d0b4fa121946a19f9e5eac2f2f809
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -195,7 +195,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 fa9f0e511a64caf66b8e7bb835c55172e7d61527
+F src/main.c e50203613fb77e2f28deb51425ee52b3879e85f8
 F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
@@ -1224,7 +1224,8 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P e9955c0e14d13ba1411f013acb4979958dae2516 71f589e3f82a07513425e212072f32748c0732d4
-R 2f7d3cb7a2e1e65c7403b8d51d471007
+P adca7688de20ff40d8ddf2107dfaf92af3873b83
+Q +48529508cfe2f9445a6940222fe5ff7cc92aef78
+R 943a66e258c43484e6287cfb624784df
 U drh
-Z 971c54886e3dd2c38037eed368c93472
+Z 9be13842ba3000b4a28c2a5894f2ade5
index adefef81dc963c534e05dde93756c68d4129c092..34d0aae3a8a102a8619b37e9f9b5ac2e5bacb918 100644 (file)
@@ -1 +1 @@
-adca7688de20ff40d8ddf2107dfaf92af3873b83
\ No newline at end of file
+7ed3346e8c10dbf52fd44ab69900699d4f7ad3fd
\ No newline at end of file
index 39c65baabcd327f17db8a2b23dac9fe2a70d0303..34093b249587f1a922dd1f602cedb4b17f308029 100644 (file)
@@ -1032,15 +1032,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;
       }
     }