Merge latest trunk changes with this branch.

FossilOrigin-Name: 76212f2c9a3c3ff0e238d6dad776938c6af674e6

diff --cc manifest
index 980bed6d09e2268c6152a5c24a8f1ba5e1712ca6,f8fe7806e281fbd6b3d82ba9453bf5ea83b2ac82..00214ef2872edc9abe1b2d76dded17dc88f7eded
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Minor\soptimizations\sto\sfts5\swrites.
- D 2015-01-31T15:23:44.132
 -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\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2015-02-02T09:40:36.284
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5407a688f4d77a05c18a8142be8ae5a2829dd610
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -78,9 -78,9 +78,9 @@@ F ext/fts3/README.content fdc666a70d525
  F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a
  F ext/fts3/README.tokenizers e0a8b81383ea60d0334d274fadf305ea14a8c314
  F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
- F ext/fts3/fts3.c 5c464816508e40feb3c61f1f5566551764698fc8
+ F ext/fts3/fts3.c 56a78f7e65e9e59bd0e75a1e10ce406f62034ca8
 -F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
 +F ext/fts3/fts3.h 62a77d880cf06a2865052726f8325c8fabcecad7
- F ext/fts3/fts3Int.h 53d4eca1fb23eab00681fb028fb82eb5705c1e21
+ F ext/fts3/fts3Int.h 394858c12a17740f7a1f6bd372c4606d4425a8d1
  F ext/fts3/fts3_aux.c 5c211e17a64885faeb16b9ba7772f9d5445c2365
  F ext/fts3/fts3_expr.c 40123785eaa3ebd4c45c9b23407cc44ac0c49905
  F ext/fts3/fts3_hash.c 29b986e43f4e9dd40110eafa377dc0d63c422c60
@@@ -240,7 -195,7 +240,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 aacb8f370a15d96f62cd1493556b0ba71f13859d
 -F src/main.c ce38ddcedf33e5530b0e6c592809bb8822a6e8d0
++F src/main.c fe876f31d6744341d9e2de4da66f33563edec9cb
  F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
@@@ -283,8 -238,8 +283,8 @@@ F src/sqliteInt.h c4e05f7489cd300f856e2
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
 -F src/tclsqlite.c b8014393a96a9781bb635c8b1f52fc9b77a2bfcf
 +F src/tclsqlite.c d2a15339103ff7c61ab7766ea8f4f549997e6590
- F src/test1.c 00a74fbc6604e1bcd240726a9ff8d0cc123374e7
+ F src/test1.c 90fbedce75330d48d99eadb7d5f4223e86969585
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
  F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -346,8 -301,8 +346,8 @@@ F src/vdbeblob.c 4af4bfb71f6df7778397b4
  F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
  F src/vdbesort.c 6d64c5448b64851b99931ede980addc3af70d5e2
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
 -F src/vtab.c c08ec66f45919eaa726bf88aa53eb08379d607f9
 +F src/vtab.c ec672a0b5d507f24b9294c0696dbd2fd2ce9b122
- F src/wal.c 85353539f2d9d0c91ebd057c32525b1e1aa3335e
+ F src/wal.c 39303f2c9db02a4e422cd8eb2c8760420c6a51fe
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
  F src/where.c d46de821bc604a4fd36fa3928c086950e91aafb1
@@@ -675,6 -630,7 +675,7 @@@ F test/genesis.tcl 1e2e2e8e5cc4058549a1
  F test/hexlit.test f9ecde8145bfc2341573473256c74ae37a200497
  F test/hook.test 162d7cef7a2d2b04839fe14402934e6a1b79442f
  F test/icu.test 70df4faca133254c042d02ae342c0a141f2663f4
 -F test/imposter1.test c3f1db2d3db2c24611a6596a3fc0ffc14f1466c8 w test/initmode.test
++F test/imposter1.test c3f1db2d3db2c24611a6596a3fc0ffc14f1466c8
  F test/in.test 047c4671328e9032ab95666a67021adbbd36e98e
  F test/in2.test 5d4c61d17493c832f7d2d32bef785119e87bde75
  F test/in3.test 3cbf58c87f4052cee3a58b37b6389777505aa0c0
@@@ -1283,7 -1238,7 +1284,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 0e225b15357765f132c3364b222f9931a608a5b2
- R bf6974c43532ef38693ab05d4629d2ec
 -P 98e029134dc1300d3ecb48b41b5107ec69ba85db
 -R ae5f14ccaf584de0786e4614152020d2
 -U drh
 -Z c23d2e36f9e88e779a131b19c0ee1b9b
++P 1fffe51fa92f1784365140d5b163ab6c690981ae 42d5601739c90434e5adfda8fa99ef7b903877db
++R 668d2feec869c09e5368ca6aaf5507f3
 +U dan
- Z 8f2a2071b0090e43c31fbea210c6dce0
++Z dfa214b77fdf4b594624abdda6f53f9b

diff --cc manifest.uuid
index 734bdb3e9cc59685c261f099a6b28c9d79ce96ee,9eba1b1a5401baf9e1a85d06af0e3170ac218928..c32532fc483d356fa61b0868904af17097016e89
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 1fffe51fa92f1784365140d5b163ab6c690981ae
 -42d5601739c90434e5adfda8fa99ef7b903877db
++76212f2c9a3c3ff0e238d6dad776938c6af674e6

diff --cc src/main.c
Simple merge