From a8f249f1e7d284495683b3e74c0fb3bf9a1acb50 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Thu, 20 May 2021 11:42:51 +0000
Subject: [PATCH] Ensure the required b-tree mutexes are held for "CREATE TABLE
 IF NOT EXISTS" and "DROP TABLE IF EXISTS" statements on attached databases.

FossilOrigin-Name: 67bde01614edd944b769ab28488bac1dbbf17d88beee62ca7f1e45681aa3d402
---
 manifest      | 16 ++++++++--------
 manifest.uuid |  2 +-
 src/build.c   |  1 +
 src/vdbe.c    |  1 +
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 999e001c67..2fd9c8a2a0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Replace\s[0f0959c6f95046e8]\swith\sa\snew\sand\sbetter\ssolution\sthat\salso\sfixes\sthe\nCTE\sname\sresolution\sproblem\sdescribed\sin\n[forum:/forumpost/8590e3f6dc|forum\spost\s8590e3f6dc].\nTest\scases\sfor\sboth\sproblems\sadded.
-D 2021-05-20T00:44:04.904
+C Ensure\sthe\srequired\sb-tree\smutexes\sare\sheld\sfor\s"CREATE\sTABLE\sIF\sNOT\sEXISTS"\sand\s"DROP\sTABLE\sIF\sEXISTS"\sstatements\son\sattached\sdatabases.
+D 2021-05-20T11:42:51.885
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -487,7 +487,7 @@ F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
 F src/btree.c 51ba86095316fceb3e25bc61617d673d84627e79f4ace83f8722910f33eedef3
 F src/btree.h 096cc53baa58be22b02c896d1cf933c38cfc6d65f9253c1367ece8cc88a24de5
 F src/btreeInt.h 7bc15a24a02662409ebcd6aeaa1065522d14b7fda71573a2b0568b458f514ae0
-F src/build.c 4e13b92f77d3f6dc1285c3636a2ba7c6af5cbb793e52075a762fbcebcd36e968
+F src/build.c daeb1beb04e3729456f095686bc26bb0cde026263fc281257d431ba22c2e7f21
 F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 3052b6b05ed9ef547a3dd66b8e01bfa9d582e78752ad6ed327da84652641e038
@@ -615,7 +615,7 @@ F src/upsert.c df8f1727d62b5987c4fd302cd4d7c0c84ae57cd65683c5a34a740dfe24039235
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c 41c7a72da1df47864faa378a1c720b38adb288c6838cb6be5594511b6287a048
 F src/vacuum.c 492422c1463c076473bae1858799c7a0a5fe87a133d1223239447c422cd26286
-F src/vdbe.c 74491791630743ef5215a90e6ec94c0965577b9b7086b2180d2c7fa0954317a8
+F src/vdbe.c 73e5a8b64a77359f4287d76f168e89d12ba967cbb72a3d7619650568e9c1d66c
 F src/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe
 F src/vdbeInt.h 58980223a32495ad059d10581b83e133abdc77248b1bab85c080cab8a13bd819
 F src/vdbeapi.c d9e99daf59fec928986838b3389a7337e82fec6b3b5de30206cb99fb4661b94e
@@ -1913,7 +1913,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 34579549a3bc1c2cfbf47a4770c1d7abc97869ba57bcd3ab1515765ca505ea05
-R c15d075f9e4ae67875b0e31adc3c6940
-U drh
-Z 78f6695751cf87d51e05323e72bdbac5
+P 5614279daff5007d6e047c5c1b3cc82ba80a5c91c529525b0fe68b79ee82dd2c
+R 251664671ece9be13f0ddcdf8743ebe8
+U dan
+Z 672cf1b2a06b80094d8081e553158747
diff --git a/manifest.uuid b/manifest.uuid
index 9fec0088b5..dc3e3762b4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5614279daff5007d6e047c5c1b3cc82ba80a5c91c529525b0fe68b79ee82dd2c
\ No newline at end of file
+67bde01614edd944b769ab28488bac1dbbf17d88beee62ca7f1e45681aa3d402
\ No newline at end of file
diff --git a/src/build.c b/src/build.c
index 25954b4d44..4f76c9380f 100644
--- a/src/build.c
+++ b/src/build.c
@@ -1070,6 +1070,7 @@ static void sqlite3ForceNotReadOnly(Parse *pParse){
   Vdbe *v = sqlite3GetVdbe(pParse);
   if( v ){
     sqlite3VdbeAddOp3(v, OP_JournalMode, 0, iReg, PAGER_JOURNALMODE_QUERY);
+    sqlite3VdbeUsesBtree(v, 0);
   }
 }
 
diff --git a/src/vdbe.c b/src/vdbe.c
index 54588b2a10..ad3008669a 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -7247,6 +7247,7 @@ case OP_JournalMode: {    /* out2 */
   pPager = sqlite3BtreePager(pBt);
   eOld = sqlite3PagerGetJournalMode(pPager);
   if( eNew==PAGER_JOURNALMODE_QUERY ) eNew = eOld;
+  assert( sqlite3BtreeHoldsMutex(pBt) );
   if( !sqlite3PagerOkToChangeJournalMode(pPager) ) eNew = eOld;
 
 #ifndef SQLITE_OMIT_WAL