Add missing mutex calls around a call to sqlite3SchemaGet() within sqlite3_open().

FossilOrigin-Name: 266b3441c6779b255a641bedbff79dd757ed6df5

diff --git a/manifest b/manifest
index 4ecd18674bf62488b7cb5ab65509b8788e1cf60d..88fb0760356a56c842e128618fa5bc30f2b38e81 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Increase\sthe\sversion\snumber\sto\s3.8.7.4.
-D 2014-12-08T18:02:47.286
+C Add\smissing\smutex\scalls\saround\sa\scall\sto\ssqlite3SchemaGet()\swithin\ssqlite3_open().
+D 2014-12-08T20:23:30.369
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -194,7 +194,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 b750d8a989b4599b1b886247b47323494e19ac3d
+F src/main.c 53c7e58ae1569c2d383eb13a6a4310d56d701027
 F src/malloc.c 3c3ac67969612493d435e14b6832793209afd2ec
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
@@ -893,7 +893,7 @@ F test/thread2.test f35d2106452b77523b3a2b7d1dcde2e5ee8f9e46
 F test/thread_common.tcl 334639cadcb9f912bf82aa73f49efd5282e6cadd
 F test/threadtest1.c 6029d9c5567db28e6dc908a0c63099c3ba6c383b
 F test/threadtest2.c ace893054fa134af3fc8d6e7cfecddb8e3acefb9
-F test/threadtest3.c 0ed13e09690f6204d7455fac3b0e8ece490f6eef
+F test/threadtest3.c fca8d360b470405ae3ed431b5cb4cdf031f85a74
 F test/tkt-02a8e81d44.test 6c80d9c7514e2a42d4918bf87bf6bc54f379110c
 F test/tkt-26ff0c2d1e.test 888324e751512972c6e0d1a09df740d8f5aaf660
 F test/tkt-2a5629202f.test 0521bd25658428baa26665aa53ffed9367d33af2
@@ -1057,6 +1057,7 @@ F test/triggerC.test a68980c5955d62ee24be6f97129d824f199f9a4c
 F test/triggerD.test 8e7f3921a92a5797d472732108109e44575fa650
 F test/triggerE.test 355e9c5cbaed5cd039a60baad1fb2197caeb8e52
 F test/tt3_checkpoint.c 415eccce672d681b297485fc20f44cdf0eac93af
+F test/tt3_index.c 2e7f3151a0ae522f031e8e2761ca2bda63f4d221
 F test/types.test bf816ce73c7dfcfe26b700c19f97ef4050d194ff
 F test/types2.test 3555aacf8ed8dc883356e59efc314707e6247a84
 F test/types3.test 99e009491a54f4dc02c06bdbc0c5eea56ae3e25a
@@ -1206,7 +1207,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 3ddc7e4c7778a6708856776471ded65f78825487
-R 73abb1cfc0438311d6addbc123371521
-U drh
-Z e423815c02672dff875a4cc1a1f11988
+P 33c900279f29ebcfc07095f3eda6bf741e0fba19
+Q +45415899545767888d36dcc0bafaf0ef415d94c2
+R 7238552a405d489ba6d9ae50c24c64c9
+U dan
+Z 274ba313a7b6b90c44d93750437d1e74

diff --git a/manifest.uuid b/manifest.uuid
index c3a8ae3251452cb3074e175cfddc27e9cbe8e503..90a7f8ca0b37ce27a546783ed77461e2d19f0623 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-33c900279f29ebcfc07095f3eda6bf741e0fba19
\ No newline at end of file
+266b3441c6779b255a641bedbff79dd757ed6df5
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 6438258ab6248752651545c6f4bb3088155a633e..fc03700aa37e073c7dcb0cb3479bfb78ce7502c9 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -2587,7 +2587,9 @@ static int openDatabase(
     sqlite3Error(db, rc);
     goto opendb_out;
   }
+  sqlite3BtreeEnter(db->aDb[0].pBt);
   db->aDb[0].pSchema = sqlite3SchemaGet(db, db->aDb[0].pBt);
+  sqlite3BtreeLeave(db->aDb[0].pBt);
   db->aDb[1].pSchema = sqlite3SchemaGet(db, 0);
 
   /* The default safety_level for the main database is 'full'; for the temp

diff --git a/test/threadtest3.c b/test/threadtest3.c
index cb7e2fa41b190d7ccc2613503ac6a60dcf1aae72..084ca022a9808e83a78315b759c76f097bf14ff1 100644 (file)
--- a/test/threadtest3.c
+++ b/test/threadtest3.c
@@ -1394,7 +1394,10 @@ static void dynamic_triggers(int nMs){
   print_and_free_err(&err);
 }
 
+
+
 #include "tt3_checkpoint.c"
+#include "tt3_index.c"
 
 int main(int argc, char **argv){
   struct ThreadTest {
@@ -1414,6 +1417,8 @@ int main(int argc, char **argv){
 
     { checkpoint_starvation_1, "checkpoint_starvation_1", 10000 },
     { checkpoint_starvation_2, "checkpoint_starvation_2", 10000 },
+
+    { create_drop_index_1, "create_drop_index_1", 10000 },
   };
 
   int i;

diff --git a/test/tt3_index.c b/test/tt3_index.c
new file mode 100644 (file)
index 0000000..b79768c
--- /dev/null
+++ b/test/tt3_index.c
@@ -0,0 +1,74 @@
+/*
+** 2014 December 9
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+**
+**     create_drop_index_1
+*/
+
+
+static char *create_drop_index_thread(int iTid, int iArg){
+  Error err = {0};                /* Error code and message */
+  Sqlite db = {0};                /* SQLite database connection */
+
+  while( !timetostop(&err) ){
+    opendb(&err, &db, "test.db", 0);
+
+    sql_script(&err, &db, 
+
+      "DROP INDEX IF EXISTS i1;"
+      "DROP INDEX IF EXISTS i2;"
+      "DROP INDEX IF EXISTS i3;"
+      "DROP INDEX IF EXISTS i4;"
+
+      "CREATE INDEX IF NOT EXISTS i1 ON t1(a);"
+      "CREATE INDEX IF NOT EXISTS i2 ON t1(b);"
+      "CREATE INDEX IF NOT EXISTS i3 ON t1(c);"
+      "CREATE INDEX IF NOT EXISTS i4 ON t1(d);"
+
+      "SELECT * FROM t1 ORDER BY a;"
+      "SELECT * FROM t1 ORDER BY b;"
+      "SELECT * FROM t1 ORDER BY c;"
+      "SELECT * FROM t1 ORDER BY d;"
+    );
+
+    closedb(&err, &db);
+  }
+
+  print_and_free_err(&err);
+  return sqlite3_mprintf("ok");
+}
+
+static void create_drop_index_1(int nMs){
+  Error err = {0};
+  Sqlite db = {0};
+  Threadset threads = {0};
+
+  opendb(&err, &db, "test.db", 1);
+  sql_script(&err, &db, 
+     "CREATE TABLE t1(a, b, c, d);"
+     "WITH data(x) AS (SELECT 1 UNION ALL SELECT x+1 FROM data WHERE x<100) "
+     "INSERT INTO t1 SELECT x,x,x,x FROM data;"
+  );
+  closedb(&err, &db);
+
+  setstoptime(&err, nMs);
+
+  sqlite3_enable_shared_cache(1);
+  launch_thread(&err, &threads, create_drop_index_thread, 0);
+  launch_thread(&err, &threads, create_drop_index_thread, 0);
+  launch_thread(&err, &threads, create_drop_index_thread, 0);
+  launch_thread(&err, &threads, create_drop_index_thread, 0);
+  launch_thread(&err, &threads, create_drop_index_thread, 0);
+  sqlite3_enable_shared_cache(0);
+
+  join_all_threads(&err, &threads);
+  print_and_free_err(&err);
+}