Merge the SQLITE_TESTCTRL_IMPOSTER changes from trunk.

FossilOrigin-Name: 3ed6eb2fab5d95709ef392170339e6dd5ba13971

diff --cc manifest
index a2a6f9c0c16799a76d9077ff9f48d8effc4ec91e,f8fe7806e281fbd6b3d82ba9453bf5ea83b2ac82..0d5c8c88886fdf04b27593ad8e4b6762e96751f7
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sall\srecent\strunk\schanges,\sand\sespecially\sthe\sSQLITE_TESTCTRL_INITMODE\nenhancement.
- D 2015-01-30T16:36:17.286
 -C Change\sSQLITE_TESTCTRL_INITMODE\sto\sSQLITE_TESTCTRL_IMPOSTER.\s\sRevise\sthe\sorder\nof\sparameters.\s\sGive\sit\sthe\sability\sto\sreset\sthe\sschema\sparse\stable\sso\sthat\nimposter\stables\scan\sbe\serased.
 -D 2015-01-30T20:59:27.457
++C Merge\sthe\sSQLITE_TESTCTRL_IMPOSTER\schanges\sfrom\strunk.
++D 2015-01-30T21:00:10.049
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5407a688f4d77a05c18a8142be8ae5a2829dd610
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -188,10 -173,10 +188,10 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 7ddee9c7d505e07e959a575b18498f17c71e53ea
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5
- F src/btree.c 73cfa1752138438088a20f17f7bc501ba3b999b4
 -F src/btree.c 2a1245df0356a229bcd0fd87a8536b5067f16e82
++F src/btree.c ddca0ae681c49813a4bfd88d5f922fac71e0ffaa
  F src/btree.h 94277c1d30c0b75705974bcc8b0c05e79c03d474
  F src/btreeInt.h a3d0ae1d511365e1a2b76ad10960dbe55c286f34
- F src/build.c f5cfd7b32216f695b995bbc7c1a395f6d451d11f
+ F src/build.c eefaa4f1d86bc3c08023a61fdd1e695b47796975
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c 198a0066ba60ab06fc00fba1998d870a4d575463
  F src/ctime.c 98f89724adc891a1a4c655bee04e33e716e05887
@@@ -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 cf9e43a0900f35d708eca1f04db133d3860be996
 -F src/main.c ce38ddcedf33e5530b0e6c592809bb8822a6e8d0
++F src/main.c d6c5fd51a719fcdcf1cc9ef08349dbd4454cf2f3
  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 ed7cf7c29fb1a23d47179affc89cb447868fc976
- F src/sqlite.h.in 944152036fea0e4a0b3329a7d19fb3186aaa9232
+ F src/shell.c 22b4406b0b59efd14b3b351a5809dda517df6d30
 -F src/sqlite.h.in 54678c21401909f72b221344dd560d285a1ba5eb
++F src/sqlite.h.in 78e493f94202d8083dd270e257786a6311d1fb3b
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h 25b73f7edb325b827522f7d9c3273f7c7d6d4cd6
 -F src/sqliteInt.h c4e05f7489cd300f856e2283d5e61302ce826471
++F src/sqliteInt.h 66180aa8f81155a7f391bbf759ee5a3b61d2f89f
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
 -F src/tclsqlite.c b8014393a96a9781bb635c8b1f52fc9b77a2bfcf
 -F src/test1.c 90fbedce75330d48d99eadb7d5f4223e86969585
 +F src/tclsqlite.c b321464aba1fff1ed9317ebc82a1a94887f97af8
- F src/test1.c 32ab487d570f8864c4040be6d5eca8d1f392dbbf
++F src/test1.c 313567541c980e45220d6faed393b6ad454f8ecd
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
  F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -1254,7 -1238,7 +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 6f8cda26e93f09eadf0b084131a1d4002d94d959 98e029134dc1300d3ecb48b41b5107ec69ba85db
- R d1091e1b241c9e756b3cdf5ab40acb3b
 -P 98e029134dc1300d3ecb48b41b5107ec69ba85db
 -R ae5f14ccaf584de0786e4614152020d2
++P 36436dde74ce2536a9a430b4458216499ad113bf 42d5601739c90434e5adfda8fa99ef7b903877db
++R 8701f18a4ed2282b10e5999d74aa1b13
  U drh
- Z f1982de9d1fa245a5e8f00d7b4ec9b1f
 -Z c23d2e36f9e88e779a131b19c0ee1b9b
++Z 76979458fdcef8860d5505bc7f40ac6e

diff --cc manifest.uuid
index 87dae2d2b948435b4a22c83a935ea6f7a0bdc02f,9eba1b1a5401baf9e1a85d06af0e3170ac218928..41edd762becfda7e035493a32ff28303fbf47da1
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 36436dde74ce2536a9a430b4458216499ad113bf
 -42d5601739c90434e5adfda8fa99ef7b903877db
++3ed6eb2fab5d95709ef392170339e6dd5ba13971

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge