Disable sqlite3_drop_module() tests when virtual tables are omitted from

the build.

FossilOrigin-Name: 9f4035f91a9f914797c67afbf19139b2cd25aea48595f7254fe5d18cd693d972

diff --git a/manifest b/manifest
index 3a265c0347a29fe9ca3c42c7c82e0f18667a3461..a6f89fa92b9a307c40992a74771a4b5a160f7b79 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sreferences\sto\stest\sscripts\sanalyzeA.test\sand\sanalyzeB.test\sfrom\npermutations.test,\ssince\sthose\stest\smodules\sno\slonger\sexist.
-D 2019-10-01T21:31:57.198
+C Disable\ssqlite3_drop_module()\stests\swhen\svirtual\stables\sare\somitted\sfrom\nthe\sbuild.
+D 2019-10-02T00:25:08.346
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -500,7 +500,7 @@ F src/memdb.c 02a5fcec19b9d40dd449ca802dc1b2e8f93f255fbf2a886277a3c3800d8d35db
 F src/memjournal.c 7561c01c90958f3ba9bc6cb2d857123d932bdfa5539ea34427a0957b2e35154d
 F src/msvc.h 3a15918220367a8876be3fa4f2abe423a861491e84b864fb2b7426bf022a28f8
 F src/mutex.c bae36f8af32c22ad80bbf0ccebec63c252b6a2b86e4d3e42672ff287ebf4a604
-F src/mutex.h 779d588e3b7756ec3ecf7d78cde1d84aba414f85
+F src/mutex.h a7b2293c48db5f27007c3bdb21d438873637d12658f5a0bf8ad025bb96803c4a
 F src/mutex_noop.c 9d4309c075ba9cc7249e19412d3d62f7f94839c4
 F src/mutex_unix.c aaf9ebc3f89df28483c52208497a99a02cc3650011422fc9d4c57e4392f7fe58
 F src/mutex_w32.c 7670d770c94bbfe8289bec9d7f1394c5a00a57c37f892aab6b6612d085255235
@@ -526,7 +526,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c e021be0c1c4a2125fa38aabcd8dbb764bf5b2c889a948c30d3708430ec6ccd00
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 F src/select.c f509982c96bb24ccf57a0155fbe1e6184e0b8fb8866a04397dc41baa400e5240
-F src/shell.c.in 026d8a5b3e1c477f23ef027e1ecb4c86e9e3fed0aa922e3825cf4d7feb6bdd69
+F src/shell.c.in d70bcf630c4073eaa994fa74be98886c781918e794cb8b562be8df10f018e274
 F src/sqlite.h.in 5725a6b20190a1e8d662077a1c1c8ea889ad7be90dd803f914c2de226f5fe6ab
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h cef696ce3293242c67b2339763608427bf72ee66f1f3a05389ac2a7b46001c31
@@ -535,7 +535,7 @@ F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6
 F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
 F src/tclsqlite.c 50c93be3e1c03b4e6cf6756e5197afcfe7f5cd0497d83a7ac317cde09e19b290
-F src/test1.c 07d774ae3fcd3aed48248483d550cef55cfb417bddab54f4c616b3ac8faa8e32
+F src/test1.c 17e1395cbddeb9226b756d723a7566b45b43b99a5f9f55afb4ff70888de6ad6f
 F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
 F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
 F src/test4.c 405834f6a93ec395cc4c9bb8ecebf7c3d8079e7ca16ae65e82d01afd229694bb
@@ -1845,7 +1845,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 361eb2f682a303bba72b39d322d9de630494ca044fe0508dcb23b6130d312d85
-R 79f4cd8007b6eb2ff56cba9bbf1f13f1
+P 2394879698107479270c9d899c704de3756ceae177a338b3c37844e2a31aa6dd
+R e575a5992db4cefd001fd79f1b425439
 U drh
-Z 1b640aff4d05dc808e04f7108a8ae8bf
+Z b25a5a377bbc6fe1cbeff142e9b61523

diff --git a/manifest.uuid b/manifest.uuid
index 4e71ed6c9f1a286c23a78acabfec92880235e8c5..824a5a210290bc2a4f0177483da839f8f75102cd 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2394879698107479270c9d899c704de3756ceae177a338b3c37844e2a31aa6dd
\ No newline at end of file
+9f4035f91a9f914797c67afbf19139b2cd25aea48595f7254fe5d18cd693d972
\ No newline at end of file

diff --git a/src/mutex.h b/src/mutex.h
index 03eb1faadb67a7f3b00c79f56349872965b2db74..a6806a2505900b821b6389c8f5f17ec33e8ef8fe 100644 (file)
--- a/src/mutex.h
+++ b/src/mutex.h
@@ -67,4 +67,5 @@
 #define MUTEX_LOGIC(X)
 #else
 #define MUTEX_LOGIC(X)            X
+int sqlite3_mutex_held(sqlite3_mutex*);
 #endif /* defined(SQLITE_MUTEX_OMIT) */

diff --git a/src/shell.c.in b/src/shell.c.in
index 549216e32fdbf86c98309132d8e3ba6e29a86b5c..7f82675e3529289284db555c0a8360e2358da744 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -9419,7 +9419,7 @@ static int do_meta_command(char *zLine, ShellState *p){
   }else
 #endif /* !defined(SQLITE_OMIT_TRACE) */
 
-#ifdef SQLITE_DEBUG
+#if defined(SQLITE_DEBUG) && !defined(SQLITE_OMIT_VIRTUALTABLE)
   if( c=='u' && strncmp(azArg[0], "unmodule", n)==0 ){
     int ii;
     int lenOpt;

diff --git a/src/test1.c b/src/test1.c
index 6de1ff57f2d525f49097f3728989800f7a219b8e..ffd6091fa36623acd4b1fecc14ae68510d2355c4 100644 (file)
--- a/src/test1.c
+++ b/src/test1.c
@@ -1131,7 +1131,9 @@ static int SQLITE_TCLAPI test_drop_modules(
     return TCL_ERROR;
   }
   if( getDbPointer(interp, argv[1], &db) ) return TCL_ERROR;
+#ifndef SQLITE_OMIT_VIRTUALTABLE
   sqlite3_drop_modules(db, argc>2 ? (const char**)(argv+2) : 0);
+#endif
   return TCL_OK;
 }