Rearrange some code in OP_JournalMode to avoid incorrect returns from subsequent...

FossilOrigin-Name: ce0a4a9b5f981d066822a9ae63740c91b35bfc60

diff --git a/manifest b/manifest
index b513f7911255f4701ff7e47c520413af0e4a889c..a2cd06dea2e763e18250b63ca52261bf238be381 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sthe\simplementation\sof\sthe\sunix\simplementation\sof\sxAccess()\sso\sthat\sit\sreturns\s0\s(does\snot\sexist)\sto\san\sSQLITE_ACCESS_EXISTS\squery\son\sa\sfile\sthat\sexists\sbut\sis\szero\sbytes\sin\ssize.
-D 2010-06-18T11:10:07
+C Rearrange\ssome\scode\sin\sOP_JournalMode\sto\savoid\sincorrect\sreturns\sfrom\ssubsequent\sinvocations\sof\s"PRAGMA\sjournal_mode"\sfollowing\san\sIO\serror.
+D 2010-06-18T16:13:45
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -217,7 +217,7 @@ F src/update.c 9859f2056c7739a1db0d9774ccb6c2f0cee6d1de
 F src/utf.c 1baeeac91707a4df97ccc6141ec0f808278af685
 F src/util.c 32aebf04c10e51ad3977a928b7416bed671b620b
 F src/vacuum.c 241a8386727c1497eba4955933356dfba6ff8c9f
-F src/vdbe.c e115585b14d2cc4128cb53a7e42f207750e80f55
+F src/vdbe.c 290d20ed92b560dc0b602ac50b252f9553a2d8e8
 F src/vdbe.h 471f6a3dcec4817ca33596fe7f6654d56c0e75f3
 F src/vdbeInt.h 19ebc8c2a2e938340051ee65af3f377fb99102d1
 F src/vdbeapi.c dc3138f10afbc95ed3c21dd25abb154504b1db9d
@@ -778,7 +778,7 @@ F test/walcrash.test f6d5fb2bb108876f04848720a488065d9deef69f
 F test/walcrash2.test 14585ad1a2c85da2de721caa3b4deeea55213008
 F test/walfault.test c2b524299dede269282a0795e11396cc446ca9af
 F test/walhook.test 67e675127f4acb72f061a12667ce6e5460b06b78
-F test/walmode.test 6ca9d710cc9f6545b913abcded6d6b0b15641048
+F test/walmode.test b54e2f91f34179c65cab02a6916578617a33eef0
 F test/walslow.test d21625e2e99e11c032ce949e8a94661576548933
 F test/walthread.test a25a393c068a2b42b44333fa3fdaae9072f1617c
 F test/where.test de337a3fe0a459ec7c93db16a519657a90552330
@@ -824,7 +824,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P bd7bc4e0e28bc749034ff1a9290a69330c5d8ca4
-R 2b113c40a63b7748c0ad882d1483f64f
+P 077b0e5bcd849130c8df373fc2134c4b44351882
+R 54f97d60c6d719c202a2c47c8f5392d5
 U dan
-Z 8ecd2203ce71c16c5fd05e7fedfa658b
+Z fff7f7ea627d7c4a7f85eb236bd967cc

diff --git a/manifest.uuid b/manifest.uuid
index d97862f3d8e2135632c8b54a5f0ac04ccdaf1771..9fc7060ef54e971c5523a2b8817804f88ddf1185 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-077b0e5bcd849130c8df373fc2134c4b44351882
\ No newline at end of file
+ce0a4a9b5f981d066822a9ae63740c91b35bfc60
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index 6803beafd3fa338d737bc0b72e38f99b3a4aa992..aec5712bf0267605a77e3029a586dcc95cf5871d 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -5248,8 +5248,6 @@ case OP_JournalMode: {    /* out2-prerelease */
         rc = sqlite3PagerCloseWal(pPager);
         if( rc==SQLITE_OK ){
           sqlite3PagerSetJournalMode(pPager, eNew);
-        }else if( rc==SQLITE_BUSY && pOp->p5==0 ){
-          goto abort_due_to_error;
         }
       }
   
@@ -5259,16 +5257,15 @@ case OP_JournalMode: {    /* out2-prerelease */
       assert( sqlite3BtreeIsInTrans(pBt)==0 );
       if( rc==SQLITE_OK ){
         rc = sqlite3BtreeSetVersion(pBt, (eNew==PAGER_JOURNALMODE_WAL ? 2 : 1));
-        if( rc==SQLITE_BUSY && pOp->p5==0 ) goto abort_due_to_error;
-      }
-      if( rc==SQLITE_BUSY ){
-        eNew = eOld;
-        rc = SQLITE_OK;
       }
     }
   }
 #endif /* ifndef SQLITE_OMIT_WAL */
 
+  if( rc ){
+    if( rc==SQLITE_BUSY && pOp->p5!=0 ) rc = SQLITE_OK;
+    eNew = eOld;
+  }
   eNew = sqlite3PagerSetJournalMode(pPager, eNew);
 
   pOut = &aMem[pOp->p2];

diff --git a/test/walmode.test b/test/walmode.test
index 714e0d81893b37c49d023432c1d70ca943518260..48979b19c660dfc243a265ebb206d152684c5b2a 100644 (file)
--- a/test/walmode.test
+++ b/test/walmode.test
@@ -124,46 +124,48 @@ do_test walmode-4.5 {
 # from WAL to rollback mode because a second connection has the database
 # open. Or from rollback to WAL.
 #
-do_test walmode-4.1 {
+do_test walmode-4.6 {
   sqlite3 db2 test.db
   execsql { PRAGMA main.journal_mode } db2
 } {delete}
-do_test walmode-4.2 {
+do_test walmode-4.7 {
   execsql { PRAGMA main.journal_mode = wal } db
 } {wal}
-do_test walmode-4.3 {
+do_test walmode-4.8 {
   execsql { SELECT * FROM t1 } db2
 } {1 2}
-do_test walmode-4.4 {
+do_test walmode-4.9 {
   catchsql { PRAGMA journal_mode = delete } db
 } {1 {database is locked}}
-do_test walmode-4.5 {
+do_test walmode-4.10 {
   execsql { PRAGMA main.journal_mode } db
 } {wal}
-do_test walmode-4.6 {
+
+do_test walmode-4.11 {
   db2 close
   execsql { PRAGMA journal_mode = delete } db
 } {delete}
-do_test walmode-4.7 {
+do_test walmode-4.12 {
   execsql { PRAGMA main.journal_mode } db
 } {delete}
-do_test walmode-4.8 {
+do_test walmode-4.13 {
   list [file exists test.db-journal] [file exists test.db-wal]
 } {0 0}
-do_test walmode-4.9 {
+do_test walmode-4.14 {
   sqlite3 db2 test.db
   execsql {
     BEGIN;
       SELECT * FROM t1;
   } db2
 } {1 2}
-do_test walmode-4.11 {
-  execsql { PRAGMA main.journal_mode } db
-} {delete}
-do_test walmode-4.10 {
+
+do_test walmode-4.16 { execsql { PRAGMA main.journal_mode } db  } {delete}
+do_test walmode-4.17 { execsql { PRAGMA main.journal_mode } db2 } {delete}
+
+do_test walmode-4.17 {
   catchsql { PRAGMA main.journal_mode = wal } db
 } {1 {database is locked}}
-do_test walmode-4.11 {
+do_test walmode-4.18 {
   execsql { PRAGMA main.journal_mode } db
 } {delete}
 catch { db close }
@@ -180,7 +182,6 @@ do_test walmode-5.1.1 {
   sqlite3 db :memory:
   execsql { PRAGMA main.journal_mode }
 } {memory}
-breakpoint
 do_test walmode-5.1.2 {
   execsql { PRAGMA main.journal_mode = wal }
 } {memory}