Prohibit schema changes within xBestIndex callbacks.

FossilOrigin-Name: bb0f056b3f2ecc3893e5e48e99c060788550ea6a8ed02b715953af051bafbad0

diff --git a/manifest b/manifest
index 3f090a198bad9fbb2c9316cad8ae72df9e5717a7..849f155ef8969a549514f02090a153235ce0341a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improvement\sto\sthe\ssqlite3_vtab_in_first()\sdocumentation.
-D 2022-02-02T21:06:40.067
+C Prohibit\sschema\schanges\swithin\sxBestIndex\scallbacks.
+D 2022-02-03T14:19:26.747
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -639,7 +639,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
-F src/where.c d7d996a5d4501fbf14997e965d7f641fe7b2a0dd89b2296e5310b506da3fb822
+F src/where.c 31bc1f43b0bf679e93c3e7a7d67cbcaddc7ae746694b149b282427d337b06caa
 F src/whereInt.h 1d821657238a0bd12b3c8f2926c7f8f9294bc5efe20af53c7c50d53a0a026cb9
 F src/wherecode.c 5879604677f0bdfb8d95ff616d834daecc12256346b7d9ad96a7e84a1cb08fdc
 F src/whereexpr.c fa8017f9fed4b50c59b4f105139679dd59ed7fea43179ebb0f6b8b5796a30515
@@ -1943,8 +1943,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 52559af093809b572082b5ebaacf97b727ee1860ae118530761b62e937545163
-R 36ca82b24ac7898d0154e5e4119378ab
+P 403e7ac900e53407282393747b784dc0cd4303958394534e3936fce138bc1bc5
+R 41eaf90a96fe65f5bd93b76bd7a9c7b0
 U drh
-Z 3656a02abcf77fbfe8a689ff58f19714
+Z 4e2814b092bdcbebe8f5fecedd9981df
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 9200e8bedd3739579e99e3812d2be367d9fe6d3e..1fc1027fa61856191de53fc32b987b3506e9a37a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-403e7ac900e53407282393747b784dc0cd4303958394534e3936fce138bc1bc5
\ No newline at end of file
+bb0f056b3f2ecc3893e5e48e99c060788550ea6a8ed02b715953af051bafbad0
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 11eae60e6a7bc3cc6eed743e89bac467e509c214..bd427897707720311c0763aaa0ad00158ae098bd 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -1335,7 +1335,9 @@ static int vtabBestIndex(Parse *pParse, Table *pTab, sqlite3_index_info *p){
   int rc;
 
   whereTraceIndexInfoInputs(p);
+  pParse->db->nSchemaLock++;
   rc = pVtab->pModule->xBestIndex(pVtab, p);
+  pParse->db->nSchemaLock--;
   whereTraceIndexInfoOutputs(p);
 
   if( rc!=SQLITE_OK && rc!=SQLITE_CONSTRAINT ){