Remove dead code from the OP_JournalMode opcode in the VDBE.

This code seems to have been useless since [f88c6367d2] on [20010-08-07].

FossilOrigin-Name: a89f24e2c9591d09cbe329895ceec87885059184

diff --git a/manifest b/manifest
index ffcff16331ca4da8be2cfd2055d8681c134dae3d..50fd159d4ce97a1fdcb1a734402f715205109e11 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sthe\smutex\scounter\sand\sthe\slogic\sthat\sattempts\sto\sverify\sthat\sbtree\nmutexes\sare\sheld\scontinuously.\s\sWe\sare\snot\smaking\sthat\sassumption\sat\sthis\ntime.
-D 2011-04-05T17:31:56.106
+C Remove\sdead\scode\sfrom\sthe\sOP_JournalMode\sopcode\sin\sthe\sVDBE.\nThis\scode\sseems\sto\shave\sbeen\suseless\ssince\s[f88c6367d2]\son\s[20010-08-07].
+D 2011-04-05T18:34:10.447
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -235,7 +235,7 @@ F src/update.c 81911be16ece3c3e7716aa18565b4814ec41f8b9
 F src/utf.c d83650c3ea08f7407bd9d0839d9885241c209c60
 F src/util.c cd997077bad039efc0597eb027c929658f93c018
 F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e
-F src/vdbe.c b239d70f6862f1d0d3896c96efe7d6fabae1c56c
+F src/vdbe.c 228aa30631e8055bc945cfbb8db8f7919c4ef5fb
 F src/vdbe.h 8a675fefdf7119441fe817c800a9a52440c2e797
 F src/vdbeInt.h 53dfcaf5b83297c24f537c4a54c1f35fd655b0a2
 F src/vdbeapi.c a09ad9164cafc505250d5dd6b69660c960f1308c
@@ -926,7 +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 311d0b613d9cfa2dbcbb9ef2450041b1fd48770a
-R f2efb954b9e1d86872be6fb2ad3e5711
+P 242ce7cff416a87d57d4eb624cb79fa4e2215559
+R 4126212ea9377af4a6c83d929ba0db43
 U drh
-Z c70542c8d51f5c49bbcf63ab42aa4a3a
+Z 5632e38bce7132d08196aa617cc89aa5

diff --git a/manifest.uuid b/manifest.uuid
index 1d771e4bfb91f24ef9eeeddfce9cda8eb524238e..828e0e81f9b2aaf56276cd63898f018060b889e2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-242ce7cff416a87d57d4eb624cb79fa4e2215559
\ No newline at end of file
+a89f24e2c9591d09cbe329895ceec87885059184
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index d2e60a570e8c3be39651f90c1635d6c964c27319..ce62d7f12b6a91f993960a6ae59e2f41d98edcce 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -5300,24 +5300,6 @@ case OP_JournalMode: {    /* out2-prerelease */
   );
   assert( pOp->p1>=0 && pOp->p1<db->nDb );
 
-  /* This opcode is used in two places: PRAGMA journal_mode and ATTACH.
-  ** In PRAGMA journal_mode, the sqlite3VdbeUsesBtree() routine is called
-  ** when the statement is prepared and so p->btreeMask!=0.  All mutexes
-  ** are already acquired.  But when used in ATTACH, sqlite3VdbeUsesBtree()
-  ** is not called when the statement is prepared because it requires the
-  ** iDb index of the database as a parameter, and the database has not
-  ** yet been attached so that index is unavailable.  We have to wait
-  ** until runtime (now) to get the mutex on the newly attached database.
-  ** No other mutexes are required by the ATTACH command so this is safe
-  ** to do.
-  */
-  if( p->btreeMask==0 ){
-    /* This occurs right after ATTACH.  Get a mutex on the newly ATTACHed
-    ** database. */
-    sqlite3VdbeUsesBtree(p, pOp->p1);
-    sqlite3VdbeEnter(p);
-  }
-
   pBt = db->aDb[pOp->p1].pBt;
   pPager = sqlite3BtreePager(pBt);
   eOld = sqlite3PagerGetJournalMode(pPager);