Adjust fuzzershell so that it adds the json1 extension separately for each

no connection.

FossilOrigin-Name: ca2d1e9036387d1514fe596a0b82a3d8409797c3

diff --git a/manifest b/manifest
index 13ab712bed14337b128d086b52f8a4e8aac33d81..9b1d25c77a7bfe16faff11a281c239d1c118357a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Include\sjson1.c\sin\sfuzzcheck\sand\sfuzzershell.
-D 2015-09-19T14:32:51.442
+C Adjust\sfuzzershell\sso\sthat\sit\sadds\sthe\sjson1\sextension\sseparately\sfor\seach\nno\sconnection.
+D 2015-09-19T14:57:00.533
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 8c58e3fb3db4deba588aeaf52ec7360127a108d1
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -1338,7 +1338,7 @@ F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
 F tool/extract.c 054069d81b095fbdc189a6f5d4466e40380505e2
 F tool/fast_vacuum.c 5ba0d6f5963a0a63bdc42840f678bad75b2ebce1
 F tool/fragck.tcl 5265a95126abcf6ab357f7efa544787e5963f439
-F tool/fuzzershell.c 237521ed274d4415e99da45279f2c741a002c085
+F tool/fuzzershell.c 0e2a1dd0f955cf8d8b8ccc026241d64d19211f89
 F tool/genfkey.README cf68fddd4643bbe3ff8e31b8b6d8b0a1b85e20f4
 F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5
 F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
@@ -1387,7 +1387,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 650605a820f3860b1d6e955cdda23aaff01dfdb5
-R d0993aaef717be33182c6b3fe246bf7b
+P c4b68eff7f8f5402a9abf378157767b1c96a6101
+R dd789be15f70c114ac3c8e5f362a9dfd
 U drh
-Z 5bec8cd0af94eb356b04bad4a020f93f
+Z de9e033a4646ac6291b261f0172dd95e

diff --git a/manifest.uuid b/manifest.uuid
index 27f2f4f2e579c8ddd1f5d7b13e71efff43b17e20..fa1e5eb9e16b6a8d202a8688489975522fd4c204 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c4b68eff7f8f5402a9abf378157767b1c96a6101
\ No newline at end of file
+ca2d1e9036387d1514fe596a0b82a3d8409797c3
\ No newline at end of file

diff --git a/tool/fuzzershell.c b/tool/fuzzershell.c
index e7d5dbdf46362d76d1e5de39eca904e4db26f430..e483a5ff2e98004aeac0c654bb676309693810ad 100644 (file)
--- a/tool/fuzzershell.c
+++ b/tool/fuzzershell.c
@@ -601,13 +601,6 @@ int main(int argc, char **argv){
   zIn = malloc(nAlloc);
   if( zIn==0 ) fatalError("out of memory");
 
-#ifdef SQLITE_ENABLE_JSON1
-  {
-    extern int sqlite3_json_init(sqlite3*);
-    sqlite3_auto_extension((void(*)(void))sqlite3_json_init);
-  }
-#endif
-
   /* Loop over all input files */
   for(jj=0; jj<nInFile; jj++){
 
@@ -727,6 +720,12 @@ int main(int argc, char **argv){
     #ifndef SQLITE_OMIT_TRACE
         sqlite3_trace(db, verboseFlag ? traceCallback : traceNoop, 0);
     #endif
+#ifdef SQLITE_ENABLE_JSON1
+        {
+          extern int sqlite3_json_init(sqlite3*);
+          sqlite3_json_init(db);
+        }
+#endif
         sqlite3_create_function(db, "eval", 1, SQLITE_UTF8, 0, sqlEvalFunc, 0, 0);
         sqlite3_create_function(db, "eval", 2, SQLITE_UTF8, 0, sqlEvalFunc, 0, 0);
         sqlite3_limit(db, SQLITE_LIMIT_LENGTH, 1000000);