Merge test improvements and minor fixes from trunk.

FossilOrigin-Name: 0298a9a780695b666e7c683700d9f2f889d6f826

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 797c3a00982b4ab9cd27049170715761ea94a465,66be05909f21080ed4f2746dc34f792e526b4d72..f8c7b41f3347f843fd577a27bca6a448b04d1638
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sall\schanges\sin\sthe\slatest\s3.8.11\sbeta\sinto\sthe\ssessions\sbranch.\nChanges\sinclude\sthe\srename\sof\sOTA\sto\sRBU,\sthe\sWITHOUT-ROWID-OR-Skipscan\sfix,\nand\simprovements\sto\spcache1.
- D 2015-07-23T21:59:58.899
 -C Enable\sthe\sRBU\sextension\sto\scompile\scleanly\son\sWindows\susing\sMSVC.
 -D 2015-07-24T21:19:25.937
++C Merge\stest\simprovements\sand\sminor\sfixes\sfrom\strunk.
++D 2015-07-24T22:21:01.450
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in e4e700c7c1764b1e731e2747dc9121e63eb951fc
 -F Makefile.in 4de3ef40c8b3b75c0c55ff4242a43c8ce1ad90ee
++F Makefile.in bb0577f51dd8eda80a4d14bcf830f9696e31dcce
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc bbb9d41e71f6b32ea5eb12dfec06302f7f6de70a
 -F Makefile.msc 3c258b2f98adb08c7ca5950bee2d6670d6ee3f9a
++F Makefile.msc 60f6a05fe6da8ec23596df656b3fa6c2e052cc20
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ce0ae95abd7121c534f6917c1c8f2b70d9acd4db
@@@ -267,7 -249,7 +268,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 7e9671e3b41d23a454398e8ab5b1fa5a05bd6df6
 -F main.mk 538244d18f37f30a45da813a7bc43294e6fda8cc
++F main.mk 0918e34121c7d5120d34a27653cb4bcd16d532fe
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk 0e7f04a8eb90f92259e47d80110e4e98d7ce337a
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -310,8 -292,8 +311,8 @@@ F src/insert.c a81d4454051c92d058d79cd7
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 92bafa308607dd985ca389a788cd9e0a2b608712
- F src/loadext.c e722f4b832f923744788365df5fb8515c0bc8a47
+ F src/loadext.c dfcee8c7c032cd0fd55af3e0fc1fcfb01e426df2
 -F src/main.c 0a60b7ca8252c3a6f95438fa4ce8fe5b275c69f2
 +F src/main.c 6dd8bf94f181925a50a1f494042e50a64d5ecaca
  F src/malloc.c 19461e159bccf0e2cf06a50e867963d0a7b124a8
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
@@@ -347,16 -329,16 +348,16 @@@ F src/random.c ba2679f80ec82c4190062d75
  F src/resolve.c 2d47554370de8de6dd5be060cef9559eec315005
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c 57ef3d98c4400b93eea318813be41b2af2da2217
 -F src/shell.c 8af3cced094aebb5f57a8ad739b9dafc7867eed7
 -F src/sqlite.h.in f623dd30a4fb7df2fb44a2a85e27813d25e486c2
 +F src/shell.c e4ad9031072a6d679b2c69a780014d30db62dc7f
- F src/sqlite.h.in 814992bc580544d632965a5480f8dc76eee331ed
++F src/sqlite.h.in 52dce8a4cf52ae3201507a8f0f0c68603fc925fc
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
- F src/sqlite3ext.h be1a718b7d2ce40ceba725ae92c8eb5f18003066
- F src/sqliteInt.h cdc9b0c2dc12273c60603eb6c4157dd998603039
+ F src/sqlite3ext.h a0b948ebc89bac13941254641326a6aa248c2cc4
 -F src/sqliteInt.h 81f458941cfb30c5536c37930fb6f41e66171284
++F src/sqliteInt.h d6389d1902f97533210c443f1cc77f83bd4bb73e
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
 -F src/tclsqlite.c d9439b6a910985b7fff43ba6756bcef00de22649
 +F src/tclsqlite.c e2344bee0d192397f555a24ef3fab26f2ed93bcc
- F src/test1.c 375d7bd56d9f806095deb91a3dafe61bd0e367c8
+ F src/test1.c ab312f4160fdd9c82e65e8b123e35ef17e879c07
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
  F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -409,13 -391,13 +410,13 @@@ F src/update.c 24dd6a45b8b3470e62702128
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 46358a204b35971a839341cf64599d65b151ba88
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c 195b32310c7062847a45fda214b32ceb8f8f6ab2
 -F src/vdbe.c 86be40a4568f5385048ea6623adfd11ddb7bf710
 -F src/vdbe.h 7a75045d879118b9d3af7e8b3c108f2f27c51473
 -F src/vdbeInt.h 8b54e01ad0463590e7cffabce0bc36da9ee4f816
 -F src/vdbeapi.c adabbd66eb2e3a10f3998485ee0be7e326d06ee4
 -F src/vdbeaux.c 787f5f9d58f4c6f39294ed06909ba602d1a402e6
 -F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
 -F src/vdbemem.c ae38a0d35ae71cf604381a887c170466ba518090
++F src/vdbe.c 8dbffc354f8b8bfb388d56c2e470a589fba0543c
 +F src/vdbe.h d0f8ab919146109d080cde4b0840af9b5fafad4b
 +F src/vdbeInt.h 963c87c4bf8040c0a316ca3e58f8a4888e1fa3c4
- F src/vdbeapi.c 86f01f72f8341c0394ff745e68962b17bfb0974e
++F src/vdbeapi.c 7813b9725069c8b32e6da727bcf3e73f321384a4
 +F src/vdbeaux.c 2d86fc5411e4e659c9181ef642c63dff602b3684
 +F src/vdbeblob.c ab33f9b57cfce7dddb23853090186da614be4846
 +F src/vdbemem.c 6c9e261d135fc175da2f34e46d60243a19fffb9f
  F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c 082b35a25a26e3d36f365ca8cd73c1922532f05e
@@@ -919,11 -901,11 +920,11 @@@ F test/pagerfault3.test 1003fcda009bf48
  F test/pageropt.test 6b8f6a123a5572c195ad4ae40f2987007923bbd6
  F test/pagesize.test 5769fc62d8c890a83a503f67d47508dfdc543305
  F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
- F test/pcache2.test c70d92547550136ba6f818e6a44fe246d2738604
+ F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
- F test/permutations.test dacb0a4094fbf20fc8b5c0e6d40fb5a985836b19
 -F test/permutations.test ac3b00c299250cc087d4a527b5c75a0f8aef4e54
++F test/permutations.test c57b8fa360f3b86385fc03f9b25160b5fdfbcb51
  F test/pragma.test be7195f0aa72bdb8a512133e9640ac40f15b57a2
- F test/pragma2.test f624a496a95ee878e81e59961eade66d5c00c028
+ F test/pragma2.test 8e72df3a16c0fda748ad52abf79cb8256b04a6fe
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
  F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
  F test/printf2.test 0b61566dd1c0f0b802f59dffa228c5dc5aa6b054
@@@ -1048,7 -1029,7 +1049,7 @@@ F test/tclsqlite.test 7179b4e0bf236ddf0
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
- F test/tester.tcl d3f3d3e46f0bc852a395fa1d6469b75582708ff7
 -F test/tester.tcl 83cc29c89259490b25d2d7e47535d6f2ed5a57c7
++F test/tester.tcl b1f0870442ca012effbf8659e34f9be428990696
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1385,7 -1366,7 +1386,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P db4cbefb8674c6cfff27c1e918741de1885c845c 017c5019e1ce042025d4f327e50ec50af49f9fa4
- R 9260e9fdfb3bce3b7e0f7ced18f40623
 -P 2d572b8cdc67679cc95e69677a87e7b4a82f6c2d
 -R 7ad7b2938e518b64d413cdd1d26d7b2c
 -U mistachkin
 -Z 50750fa0b6e34b0305f7afdd413b595e
++P 7f0ee77062d2fcb014942c7c62c163ccc801f21b cca79fdc3dff65907c2a59369057265b4512058f
++R afa7eed8a3a47b08d78c1d46aa2aac25
 +U drh
- Z 699bda1d1e2b37f0ec4352c1a5a3ac67
++Z d3e71694cf71fedeea79c377e4fa2c08

diff --cc manifest.uuid
index ffc2052adb4de0bcfc202cf3d8aa6cd09ef4591c,d19a7ef222e0f62492f639722092382b53080a28..6be0992b22f6495b5420356629f32f6b173294e2
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7f0ee77062d2fcb014942c7c62c163ccc801f21b
 -cca79fdc3dff65907c2a59369057265b4512058f
++0298a9a780695b666e7c683700d9f2f889d6f826

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc test/permutations.test
Simple merge

diff --cc test/tester.tcl
Simple merge