From: drh <drh@noemail.net>
Date: Thu, 29 Jan 2015 17:54:52 +0000 (+0000)
Subject: Add the INITMODE test-control.
X-Git-Tag: version-3.8.9~145^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8964b345512612175a8cbdcf636a402f54fea696;p=thirdparty%2Fsqlite.git

Add the INITMODE test-control.

FossilOrigin-Name: 5940af8e7872209ce41feb958643b23f7e55d258
---

diff --git a/manifest b/manifest
index 2b2c56f7bc..776fb5e978 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Optimize\srange\sconstraints\son\sthe\srowid\scolumn\sof\sfts3/4\stables\seven\sif\sthere\sis\sno\sMATCH\sclause\sin\sthe\squery.
-D 2015-01-29T11:52:22.452
+C Add\sthe\sINITMODE\stest-control.
+D 2015-01-29T17:54:52.194
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5407a688f4d77a05c18a8142be8ae5a2829dd610
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -195,7 +195,7 @@ F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
 F src/loadext.c 86bd4e2fccd520b748cba52492ab60c4a770f660
-F src/main.c 05bf368c934cc73d02906030846eb4d1818c10f7
+F src/main.c b0a41ca397083b137b98e6abb829c21611665d07
 F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
@@ -230,8 +230,8 @@ F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 F src/resolve.c f6c46d3434439ab2084618d603e6d6dbeb0d6ada
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 F src/select.c 1f2087523007c42900ffcbdeaef06a23ad9329fc
-F src/shell.c efd35900484377d2159189968c3445afefee3e41
-F src/sqlite.h.in 9dfc99d6533d36d6a549c4f3f01cacc8be956ada
+F src/shell.c ed7cf7c29fb1a23d47179affc89cb447868fc976
+F src/sqlite.h.in 6910064681444efb5c467472499b56bb6bcee0f4
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
 F src/sqliteInt.h eaf210295b551d4e40e622aec1b2261c0b28f844
@@ -1237,7 +1237,10 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P e7d2ec048c88237c124fbe598f8f7e950d43d90f
-R e192a378398ddf2aeb616257a71bd844
-U dan
-Z 0e830c66fc49965a9a24bd9be18f84a6
+P 85dc12625d300fe48f3c096f54ebcb8b6ef4e30a
+R fe787287eb356b79eb9ba31c0e138e4f
+T *branch * initmode-testctrl
+T *sym-initmode-testctrl *
+T -sym-trunk *
+U drh
+Z e02e8497217bad1b69deabc72f8cd27d
diff --git a/manifest.uuid b/manifest.uuid
index 9133dd0737..60ead15a06 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-85dc12625d300fe48f3c096f54ebcb8b6ef4e30a
\ No newline at end of file
+5940af8e7872209ce41feb958643b23f7e55d258
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index 8cf16b001a..26cf24a44a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3597,6 +3597,18 @@ int sqlite3_test_control(int op, ...){
       if( sqlite3GlobalConfig.isInit==0 ) rc = SQLITE_ERROR;
       break;
     }
+
+    /*   sqlite3_test_control(SQLITE_TESTCTRL_INITMODE, db, busy, iDb, newTnum);
+    **
+    ** Set the db->init.busy, db->init.iDb, and db->init.tnum fields.
+    */
+    case SQLITE_TESTCTRL_INITMODE: {
+      sqlite3 *db = va_arg(ap, sqlite3*);
+      db->init.busy = va_arg(ap,int);
+      db->init.iDb = va_arg(ap,int);
+      db->init.newTnum = va_arg(ap,int);
+      break;
+    }
   }
   va_end(ap);
 #endif /* SQLITE_OMIT_BUILTIN_TEST */
diff --git a/src/shell.c b/src/shell.c
index f9a360c7b5..1a191e0fd0 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -3536,6 +3536,7 @@ static int do_meta_command(char *zLine, ShellState *p){
       { "scratchmalloc",         SQLITE_TESTCTRL_SCRATCHMALLOC          },
       { "byteorder",             SQLITE_TESTCTRL_BYTEORDER              },
       { "never_corrupt",         SQLITE_TESTCTRL_NEVER_CORRUPT          },
+      { "initmode",              SQLITE_TESTCTRL_INITMODE               },
     };
     int testctrl = -1;
     int rc = 0;
@@ -3628,6 +3629,18 @@ static int do_meta_command(char *zLine, ShellState *p){
           break;
 #endif
 
+        case SQLITE_TESTCTRL_INITMODE:
+          if( nArg==5 ){
+            rc = sqlite3_test_control(testctrl, p->db, 
+                          integerValue(azArg[2]),
+                          integerValue(azArg[3]),
+                          integerValue(azArg[4]));
+          }else{
+            fprintf(stderr,"Usage: .testctrl initmode fBusy iDb newTnum\n");
+            rc = 1;
+          }
+          break;
+
         case SQLITE_TESTCTRL_BITVEC_TEST:         
         case SQLITE_TESTCTRL_FAULT_INSTALL:       
         case SQLITE_TESTCTRL_BENIGN_MALLOC_HOOKS: 
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index f2e802eb00..722b9235a2 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -6260,7 +6260,8 @@ int sqlite3_test_control(int op, ...);
 #define SQLITE_TESTCTRL_BYTEORDER               22
 #define SQLITE_TESTCTRL_ISINIT                  23
 #define SQLITE_TESTCTRL_SORTER_MMAP             24
-#define SQLITE_TESTCTRL_LAST                    24
+#define SQLITE_TESTCTRL_INITMODE                25
+#define SQLITE_TESTCTRL_LAST                    25
 
 /*
 ** CAPI3REF: SQLite Runtime Status