Merge the R-Tree fix and the new SQLITE_TESTCTRL_ISINIT test control from

trunk.

FossilOrigin-Name: b2f7eb3cc27ecf9a6a88907991148bca1a7d54b3

diff --cc manifest
index 04cafa52278f79102ef31291a35efd5a27d849f8,7def92e6e1d83b96fe81e997202b0683063dde78..114e1759be0bb0d873b552cbb625fc062908ff6b
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Add\ssome\sasserts\sto\sthe\sWin32\smutex\ssubsystem.
- D 2014-07-29T00:42:39.711
 -C Add\sthe\sSQLITE_TESTCTRL_ISINIT\sfile\scontrol.
 -D 2014-07-29T14:09:21.164
++C Merge\sthe\sR-Tree\sfix\sand\sthe\snew\sSQLITE_TESTCTRL_ISINIT\stest\scontrol\sfrom\ntrunk.
++D 2014-07-29T14:16:42.855
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 +F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 5b04e657cf08a9ac7fc47d876c5c8be962c47d6b
 +F Makefile.msc e31dee24038965fb6269d6d61073fd6b7e331dec
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 1c877615a9db323e3cd301e3d57d853f9d5c4a07
@@@ -189,7 -189,7 +189,7 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
- F src/main.c 0eda2715c59120ac1e940640ddd496ed16caa2f3
 -F src/main.c fbe7c756f8974c547f82396253dd507e877f411a
++F src/main.c e2fded3600437acd3faae4182648e846ccdc3c7c
  F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
@@@ -222,12 -222,12 +222,12 @@@ F src/printf.c af06f66927919730f03479fe
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c 5fc110baeacf120a73fe34e103f052632ff11a02
  F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
 -F src/select.c 6762c62e11b504aa014edceab8886495165e3a77
 -F src/shell.c 191129c3f7a9cf241aea90ff6a6be3e74d3767f0
 -F src/sqlite.h.in 5967719136e14183b2573ba619993438e2b9856e
 +F src/select.c 2657f35be771d14f56402e4aa8a7e26562415ae6
 +F src/shell.c 05e9e7f667a6340643b647c4be0db15dd7627d92
- F src/sqlite.h.in a30af69fcbc8fab8b4a00032f9f1d24ba2f01c2c
++F src/sqlite.h.in 44b761ddf5362581617d08457f11ee582eb103a2
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
 -F src/sqliteInt.h 068e42f41a09ce6b9edbe194ac8a470ab53145df
 +F src/sqliteInt.h 9c1e5b965191c54157b155e321fa473b9734e062
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -1189,7 -1184,7 +1189,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 2773a5f9879a106a89a3d0bc3c5bfdcb2fe43c7c
- R 9e10c19fd0ddd3066b284eac0abe3eac
- U mistachkin
- Z 477d633de18b2c200b7eed3df7c1c412
 -P 8cc41b0bf365af47c2061ffe44c86018945dd239
 -R 0a47475429662a9995bbe963fdd69743
++P e8f2dc5fadae96252649875c234fcdef1108bd48 8b651d4d6cde7efbc0cc7155948f477477be100e
++R cf6ae596a6404c515cc34a8685610ab8
+ U drh
 -Z e526885cd3c9012daec258cf388db74a
++Z da4425a950252cc837b6f80952633a27

diff --cc manifest.uuid
index 7bff472a409c539db5e37d88d7b2cbc153d8f627,60b259b93246cea0089f94845728905dff7025fd..c91039efc59bc687a21fcebde814490932bde65c
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e8f2dc5fadae96252649875c234fcdef1108bd48
 -8b651d4d6cde7efbc0cc7155948f477477be100e
++b2f7eb3cc27ecf9a6a88907991148bca1a7d54b3

diff --cc src/main.c
index 63949177811c475a445c42f8283981cc9de820a5,6c29602f472b16aaef880a4e5645d0ec5cb4a6c3..917c17898cb667e1a8ce48320c5ac118133c73b2
--- 1/src/main.c
--- 2/src/main.c
+++ b/src/main.c
@@@ -3371,13 -3361,16 +3371,22 @@@ int sqlite3_test_control(int op, ...)
        break;
      }
  
 -
 +    /*   sqlite3_test_control(SQLITE_TESTCTRL_SORTER_MMAP, db, nMax); */
 +    case SQLITE_TESTCTRL_SORTER_MMAP: {
 +      sqlite3 *db = va_arg(ap, sqlite3*);
 +      db->nMaxSorterMmap = va_arg(ap, int);
 +      break;
 +    }
 +
+     /*   sqlite3_test_control(SQLITE_TESTCTRL_ISINIT);
+     **
+     ** Return SQLITE_OK if SQLite has been initialized and SQLITE_ERROR if
+     ** not.
+     */
+     case SQLITE_TESTCTRL_ISINIT: {
+       if( sqlite3GlobalConfig.isInit==0 ) rc = SQLITE_ERROR;
+       break;
+     }
    }
    va_end(ap);
  #endif /* SQLITE_OMIT_BUILTIN_TEST */

diff --cc src/sqlite.h.in
index 6bad046d8574c552e94ebaf1065cec3ea04a9ef4,8d51632285c68a6022acb6d7dfea95f3fcb46f4d..efa17de6230d021eb2d8117ad843b76b8570c523
--- 1/src/sqlite.h.in
--- 2/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@@ -6193,8 -6177,8 +6193,9 @@@ int sqlite3_test_control(int op, ...)
  #define SQLITE_TESTCTRL_NEVER_CORRUPT           20
  #define SQLITE_TESTCTRL_VDBE_COVERAGE           21
  #define SQLITE_TESTCTRL_BYTEORDER               22
- #define SQLITE_TESTCTRL_SORTER_MMAP             23
- #define SQLITE_TESTCTRL_LAST                    23
+ #define SQLITE_TESTCTRL_ISINIT                  23
 -#define SQLITE_TESTCTRL_LAST                    23
++#define SQLITE_TESTCTRL_SORTER_MMAP             24
++#define SQLITE_TESTCTRL_LAST                    24
  
  /*
  ** CAPI3REF: SQLite Runtime Status