Merge all recent trunk changes, and especially the SQLITE_TESTCTRL_INITMODE

enhancement.

FossilOrigin-Name: 36436dde74ce2536a9a430b4458216499ad113bf

diff --cc ext/ota/ota2.test
index 8830f7461b6cf0015c1ed609e267d318e75bb542,0000000000000000000000000000000000000000..3c273e348a44f0bf8d1d430ec55c0a4339a9f492
mode 100644,000000..100644
--- 1/ext/ota/ota2.test
--- /dev/null
+++ b/ext/ota/ota2.test
@@@ -1,75 -1,0 +1,74 @@@
- do_test 1.3 { glob test.db* } {test.db test.db-oal}
 +# 2014 August 30
 +#
 +# 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.
 +#
 +#***********************************************************************
 +#
 +
 +if {![info exists testdir]} {
 +  set testdir [file join [file dirname [info script]] .. .. test]
 +}
 +source $testdir/tester.tcl
 +set ::testprefix ota2
 +
 +forcedelete {*}[glob -nocomplain test.db?*]
 +
 +do_execsql_test 1.0 {
 +  CREATE TABLE t1(a, b);
 +  INSERT INTO t1 VALUES(1, 2);
 +} {}
 +do_test 1.1 { glob test.db* } {test.db}
 +
 +do_execsql_test 1.2 {
 +  PRAGMA pager_ota_mode = 1;
 +  INSERT INTO t1 VALUES(3, 4);
 +  INSERT INTO t1 VALUES(5, 6);
 +  SELECT * FROM t1;
 +} {1 2 3 4 5 6}
 +
- 
++do_test 1.3 { lsort [glob test.db*] } {test.db test.db-oal}
 +
 +do_test 1.4 {
 +  sqlite3 db2 test.db
 +  db2 eval { SELECT * FROM t1 }
 +} {1 2}
 +
 +do_test 1.5 {
 +  catchsql { INSERT INTO t1 VALUES(7, 8) } db2
 +} {1 {database is locked}}
 +
 +db2 close
 +db close
 +
 +sqlite3 db test.db
 +do_execsql_test 1.6 {
 +  PRAGMA pager_ota_mode = 1;
 +  SELECT * FROM t1;
 +} {1 2 3 4 5 6}
 +
 +do_execsql_test 1.7 {
 +  INSERT INTO t1 VALUES(7,8);
 +  SELECT * FROM t1;
 +} {1 2 3 4 5 6 7 8}
 +
 +db close
 +sqlite3 db2 test.db
 +
 +do_test 1.8 {
 +  execsql { BEGIN; SELECT * FROM t1 } db2
 +} {1 2}
 +do_test 1.9 {
 +  file rename test.db-oal test.db-wal
 +  execsql { SELECT * FROM t1 } db2
 +} {1 2}
 +do_test 1.10 {
 +  execsql { COMMIT; SELECT * FROM t1 } db2
 +} {1 2 3 4 5 6 7 8}
 +
 +
 +finish_test

diff --cc manifest
index fcbd84871ce6350796d54b7a0ad78dcd0d0df21e,09d4bc0fa8ceca770b9f6c8f5cacc3246e4c4627..a2a6f9c0c16799a76d9077ff9f48d8effc4ec91e
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\smissing\sVdbeCoverage()\smacros\sto\sthe\ssqlite3_index_writer()\simplementation.
- D 2015-01-28T20:37:03.629
 -C Added\sSQLITE_TESTCTRL_INITMODE\sfor\simproved\stestability.
 -D 2015-01-30T15:52:26.210
++C Merge\sall\srecent\strunk\schanges,\sand\sespecially\sthe\sSQLITE_TESTCTRL_INITMODE\nenhancement.
++D 2015-01-30T16:36:17.286
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5407a688f4d77a05c18a8142be8ae5a2829dd610
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -123,21 -123,6 +123,21 @@@ F ext/misc/totype.c 4a167594e791abeed95
  F ext/misc/vfslog.c fe40fab5c077a40477f7e5eba994309ecac6cc95
  F ext/misc/vtshim.c babb0dc2bf116029e3e7c9a618b8a1377045303e
  F ext/misc/wholenumber.c 784b12543d60702ebdd47da936e278aa03076212
- F ext/ota/ota2.test 4568c2671d19dbde789fb9091d727a2e94880128
 +F ext/ota/README.txt 78d4a9f78f567d4bf826cf0f02df6254902562ca
 +F ext/ota/ota.c c11a85af71dccc45976622fe7a51169a481caa91
 +F ext/ota/ota1.test d76b9ec77437759e9da0ff4abe9c070bb9f4eae1
 +F ext/ota/ota10.test ab815dff9cef7248c504f06b888627d236f25e9c
++F ext/ota/ota2.test 2829bc08ffbb71b605392a68fedfd554763356a7
 +F ext/ota/ota3.test 71bd8cc0cf8d7e7d9bb11a1fcc238320a5a9d8c8
 +F ext/ota/ota4.test 60f897f329a6782ef2f24862640acf3c52e48077
 +F ext/ota/ota5.test ad0799daf8923ddebffe75ae8c5504ca90b7fadb
 +F ext/ota/ota6.test 82f1f757ec9b2ad07d6de4060b8e3ba8e44dfdd3
 +F ext/ota/ota7.test 1fe2c5761705374530e29f70c39693076028221a
 +F ext/ota/ota8.test cd70e63a0c29c45c0906692827deafa34638feda
 +F ext/ota/ota9.test d3eee95dd836824d07a22e5efcdb7bf6e869358b
 +F ext/ota/otafault.test be02466863015a583cc0ceb6aca871a5e6f7a71b
 +F ext/ota/sqlite3ota.c 84cab0f965144772068ec0183252ae5e5278f0be
 +F ext/ota/sqlite3ota.h ce378c0c503f625611713133f9c79704ea4ee7a4
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
  F ext/rtree/rtree.c 14e6239434d4e3f65d3e90320713f26aa24e167f
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
@@@ -210,7 -195,7 +210,7 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
  F src/loadext.c 86bd4e2fccd520b748cba52492ab60c4a770f660
- F src/main.c 296f12a2a3f5f97c814c9ca02772dbfc3d4c7275
 -F src/main.c 81ddebf2feb9cbd8c8ea160cdd979503f645d505
++F src/main.c cf9e43a0900f35d708eca1f04db133d3860be996
  F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
@@@ -245,16 -230,16 +245,16 @@@ F src/random.c ba2679f80ec82c4190062d75
  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 a16fe2a826ee58e7cb0cd19bc68d33ba29ac941c
+ F src/shell.c ed7cf7c29fb1a23d47179affc89cb447868fc976
 -F src/sqlite.h.in 6910064681444efb5c467472499b56bb6bcee0f4
++F src/sqlite.h.in 944152036fea0e4a0b3329a7d19fb3186aaa9232
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
 -F src/sqliteInt.h eaf210295b551d4e40e622aec1b2261c0b28f844
 +F src/sqliteInt.h 25b73f7edb325b827522f7d9c3273f7c7d6d4cd6
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
 -F src/tclsqlite.c b8014393a96a9781bb635c8b1f52fc9b77a2bfcf
 -F src/test1.c 5dcdade99e77b7b9f7760106c80a83cf50f10e1e
 +F src/tclsqlite.c b321464aba1fff1ed9317ebc82a1a94887f97af8
- F src/test1.c bc1e8e0ea360ebd4be247f041432130f9d480c54
++F src/test1.c 32ab487d570f8864c4040be6d5eca8d1f392dbbf
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
  F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -317,8 -302,8 +317,8 @@@ F src/vdbemem.c 31d8eabb0cd78bfeab4e512
  F src/vdbesort.c 6d64c5448b64851b99931ede980addc3af70d5e2
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
  F src/vtab.c c08ec66f45919eaa726bf88aa53eb08379d607f9
- F src/wal.c 4d1a785a9e90b715b5f5e0ae62bd61fe953265c4
 -F src/wal.c 39303f2c9db02a4e422cd8eb2c8760420c6a51fe
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
++F src/wal.c 735d081f736fd7fecbf8f2aa213484e641ba35ff
 +F src/wal.h 0d3ba0c3f1b4c25796cb213568a84b9f9063f465
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
  F src/where.c d46de821bc604a4fd36fa3928c086950e91aafb1
  F src/whereInt.h d3633e9b592103241b74b0ec76185f3e5b8b62e0
@@@ -1253,7 -1238,8 +1254,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 f270004016ef20f1963e0f1ad32e76bcbaeb6798
- R b0398084d8fe2aeca2bc9ad972629a75
 -P 1797158db2a818134c5cba1578f69ed85948b980 3a6e2afe408d2b0c8166d00def2048568169d87a
 -R 4fa14bf275b60ddd661b9bd3fb0ea0dd
 -T +closed 3a6e2afe408d2b0c8166d00def2048568169d87a
++P 6f8cda26e93f09eadf0b084131a1d4002d94d959 98e029134dc1300d3ecb48b41b5107ec69ba85db
++R d1091e1b241c9e756b3cdf5ab40acb3b
  U drh
- Z 8d857ec25793e6618479325cb81d1be3
 -Z b68a5e615b7688be627f33067b9af11c
++Z f1982de9d1fa245a5e8f00d7b4ec9b1f

diff --cc manifest.uuid
index c4540655ae6833ebae8b598ca24c6f3c83489bd5,d36751134285f6fcd922802cfed0613430daf027..87dae2d2b948435b4a22c83a935ea6f7a0bdc02f
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6f8cda26e93f09eadf0b084131a1d4002d94d959
 -98e029134dc1300d3ecb48b41b5107ec69ba85db
++36436dde74ce2536a9a430b4458216499ad113bf

diff --cc src/main.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/wal.c
index db56b14d2024d40a35e7140cc193130a2fb579c4,71f4a3d452fc2d4c28a33e8ec8b70014bb224d80..bf2ef44a465cae74263f7d7267d57dde8804407c
--- 1/src/wal.c
--- 2/src/wal.c
+++ b/src/wal.c
@@@ -1930,7 -1823,7 +1930,7 @@@ static int walCheckpoint
      }else if( eMode>=SQLITE_CHECKPOINT_RESTART ){
        u32 salt1;
        sqlite3_randomness(4, &salt1);
-       assert( sC.mxSafeFrame==pWal->hdr.mxFrame );
 -      assert( pInfo->nBackfill==pWal->hdr.mxFrame );
++      assert( sC.pInfo->nBackfill==pWal->hdr.mxFrame );
        rc = walBusyLock(pWal, xBusy, pBusyArg, WAL_READ_LOCK(1), WAL_NREADER-1);
        if( rc==SQLITE_OK ){
          if( eMode==SQLITE_CHECKPOINT_TRUNCATE ){