Merge latest trunk changes with this branch.

FossilOrigin-Name: 299ed55c909d327826ef47e204ef1e9afd54852b

diff --cc Makefile.in
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index b0224df9cf7e477035661707802fccdaea2535d8,0c5a5294e3b04b9bc7259cf3c60a13ee83cb8756..42b773b53fa0f684f3e879ff363f2c3eff381666
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Fix\sa\sproblem\sin\sthe\s"ota"\sutility\sprogram\scausing\sit\sto\scrash\sif\sSQLite\sfailed\sto\sopen\sthe\starget\sdatabase.
- D 2015-04-23T19:38:20.522
 -C Enhancements\sto\sthe\sMSVC\smakefile.
 -D 2015-05-13T04:50:30.732
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2015-05-14T08:58:52.919
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 34ca00e764c293f3a75208b607b4083a90a1bccf
 -F Makefile.in edfc69769e613a6359c42c06ea1d42c3bece1736
++F Makefile.in 0a6ae26396ec696221021780dffbb894ff3cead7
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 32d8fe89ac5c130f9f14293fb4a59b120895c943
+ F Makefile.msc a9fd7fd02265aa5b3b2522f5e39d975972ff906d
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
- F VERSION 2e244662b71e6e68a5c29b014ebc5b7564f4cc5a
+ F VERSION 8af05c43e00f7de32be74ff9984d792c96cdb0de
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -123,27 -123,8 +123,27 @@@ 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/ota.c c47352838b967384a81eda5de75c352922a0dd6e
 +F ext/ota/ota1.test 960418e4171a989426f8b1ad8ee31770e0f94fb8
 +F ext/ota/ota10.test 85e0f6e7964db5007590c1b299e75211ed4240d4
 +F ext/ota/ota11.test 2f606cd2b4af260a86b549e91b9f395450fc75cb
 +F ext/ota/ota12.test 0dff44474de448fb4b0b28c20da63273a4149abb
 +F ext/ota/ota13.test f7a3d73fa5d3fabf2755b569f125fce7390a874c
 +F ext/ota/ota3.test 3fe3521fbdce32d0e4e116a60999c3cba47712c5
 +F ext/ota/ota5.test ad0799daf8923ddebffe75ae8c5504ca90b7fadb
 +F ext/ota/ota6.test 3bde7f69a894748b27206b6753462ec3b75b6bb6
 +F ext/ota/ota7.test 1fe2c5761705374530e29f70c39693076028221a
 +F ext/ota/ota8.test cd70e63a0c29c45c0906692827deafa34638feda
 +F ext/ota/ota9.test d3eee95dd836824d07a22e5efcdb7bf6e869358b
 +F ext/ota/otaA.test ab67f7f53670b81c750dcc946c5b704f51c429a4
 +F ext/ota/otacrash.test 8346192b2d46cbe7787d5d65904d81d3262a3cbf
 +F ext/ota/otafault.test 8c43586c2b96ca16bbce00b5d7e7d67316126db8
 +F ext/ota/otafault2.test fa202a98ca221faec318f3e5c5f39485b1256561
 +F ext/ota/sqlite3ota.c 5bfd677bd956d0ea9f0022b010ac70409e8e9bf6
 +F ext/ota/sqlite3ota.h 7faa45e080b9c136e666c383187ff6e39d88135b
 +F ext/ota/test_ota.c e34c801c665d64b4b9e00b71f1acf8c652404b2b
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
- F ext/rtree/rtree.c 14e6239434d4e3f65d3e90320713f26aa24e167f
+ F ext/rtree/rtree.c 0c207fd8b814a35537d96681cbf57436e200b75e
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
  F ext/rtree/rtree1.test 541bbcab74613907fea08b2ecdcdd5b7aa724cc9
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@@ -171,7 -152,7 +171,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk e58fe4b049a08b1fa73567790495b70f686f6162
 -F main.mk d49723483ee9e4fb71dc2bd0e6be58705a481e73
++F main.mk 59e4ac92e080c23d8e260195748c8a706dd18a20
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk d5e22023b5238985bb54a72d33e0ac71fe4f8a32
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -190,21 -171,22 +190,22 @@@ F src/analyze.c d23790787f80ebed58df777
  F src/attach.c c38ac5a520a231d5d0308fd7f2ad95191c867bae
  F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
  F src/backup.c ff743689c4d6c5cb55ad42ed9d174b2b3e71f1e3
- F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
+ F src/bitvec.c 5eb7958c3bf65210211cbcfc44eff86d0ded7c9d
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
- F src/btree.c 127aceb71ba93f59bc9c6ba810e992a04299e98a
+ F src/btree.c 30a80340481098d699398cba3536c895373b2e2c
  F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
  F src/btreeInt.h 973a22a6fd61350b454ad614832b1f0a5e25a1e4
- F src/build.c e246c2cea69c8f6fc825a156ea2de9dd4a17f18b
+ F src/build.c 61b47073f79f31e80a05db9ce13c5ca81bf8f74e
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c a5cf5b4b56390cfb7b8636e8f7ddef90258dd575
- F src/ctime.c 98f89724adc891a1a4c655bee04e33e716e05887
+ F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
  F src/date.c e4d50b3283696836ec1036b695ead9a19e37a5ac
 -F src/dbstat.c f402e77e25089c6003d0c60b3233b9b3947d599a
++F src/dbstat.c f402e77e25089c6003d0c60b3233b9b3947d599a w src/test_stat.c
  F src/delete.c 37964e6c1d73ff49cbea9ff690c9605fb15f600e
- F src/expr.c 4c05a28eebe63b288fda1db0e8de556a82ca2ec6
+ F src/expr.c 3fb2ab3ab69d15b4b75ae53fceb4e317f64cb306
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c c9b63a217d86582c22121699a47f22f524608869
- F src/func.c 1414c24c873c48796ad45942257a179a423ba42f
+ F src/func.c 5b8b8e77a0fb644eaf8947d413804622e32692b6
  F src/global.c 4f77cadbc5427d00139ba43d0f3979804cbb700e
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
@@@ -245,21 -227,21 +246,21 @@@ F src/pcache1.c 69d137620a305f814398bd2
  F src/pragma.c c1f4d012ea9f6b1ce52d341b2cd0ad72d560afd7
  F src/pragma.h 09c89bca58e9a44de2116cc8272b8d454657129f
  F src/prepare.c 1fffbdcd6f8a0173a8f70d71f22528f4c0e1e3d3
- F src/printf.c 08fa675c200aac29e561c6153f91f909ed17612f
+ F src/printf.c 54dd6dce95454fadffa3ebf7717c5f6c06250d1d
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c 13109bc3b5ab404446296efa17039640de5bc35d
+ F src/resolve.c 99eabf7eff0bfa65b75939b46caa82e2b2133f28
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 35433ea8894ac42594ddc31eb0165a6d6401cfe5
- F src/shell.c 78eabce4c16c45e36fea2368f95118116399ba8a
- F src/sqlite.h.in 3be4d9a7d38ef83fadd4aadd7ef3c6039e165da7
+ F src/select.c 1b0bfc7d59e48c26b895a6b719157111a617d9e3
+ F src/shell.c 07dda7cd692911d2f22269953418d049f2e2c0ee
 -F src/sqlite.h.in bf3fe5eba3a5142477b8dae3cfce627c3e971455
++F src/sqlite.h.in ad7ce501e5447f89785d6c04bb61d0514554bcd2
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h 8abcea1295138f10ef8f7ed38db5f1b573b93ece
+ F src/sqliteInt.h c9f77bd02f419dcc8c644c5032c42eb29069a545
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
- F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
- F src/tclsqlite.c 9ac7a3ee50a14e7aa4cbd35a6fb5c7c1bbf89e16
- F src/test1.c 90fbedce75330d48d99eadb7d5f4223e86969585
+ F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
 -F src/tclsqlite.c 9111a95999edac92229c972e2c34fbc171bbb6c5
++F src/tclsqlite.c 555f6467706905ab02a9df6cf1a84b1774a4754a
+ F src/test1.c a8e09b811f70184ce65012f27f30cfee7e54f268
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
  F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -271,9 -253,9 +272,9 @@@ F src/test9.c bea1e8cf52aa93695487baded
  F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8
  F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
  F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803
- F src/test_blob.c 1f2e3e25255b731c4fcf15ee7990d06347cb6c09
+ F src/test_blob.c e5a7a81d61a780da79101aeb1e60d300af169e07
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
 -F src/test_config.c c2d3ff6c129d50183900c7eff14158ff7e9b3f03
 +F src/test_config.c 7d28ede476189eefd75252fa9acaadc6ba93a733
  F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
@@@ -318,16 -299,16 +318,16 @@@ F src/vdbeInt.h 9cbaa84f53ddd2d09a0cf61
  F src/vdbeapi.c 583d56b129dd27f12bed518270de9ebe521e6a75
  F src/vdbeaux.c 03591cca98ec50e1493043f0ff7abbece0b9c83d
  F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
- F src/vdbemem.c b5256445b318b0f2b3bc429028469cfbb08f19a5
- F src/vdbesort.c 2e7f683464fd5db3be4beaa1ff2d39e24fcb64b8
- F src/vdbetrace.c f95c2dff9041fcf07f871789c22ebb0648ea0b7c
- F src/vtab.c 5f81f8a59c1f5ddb94c918f25ed5d83578fcc633
+ F src/vdbemem.c 7bfbeef0978a2e1a05d979641fdbf7c189b7ddf4
+ F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
+ F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
+ F src/vtab.c c535e80259ebe616467181a83a4263555b97c694
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
- F src/wal.c 753995db83247f20361a8e8a874990b21a75abd9
+ F src/wal.c ce2cb2d06faab54d1bce3e739bec79e063dd9113
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
- F src/where.c 80998bcd8929d2d098ee8d68a81215d5a22ef127
 -F src/where.c 85fff9c40569ccb79c3177419b339e7d7df566cb
 -F src/whereInt.h cbe4aa57326998d89e7698ca65bb7c28541d483c
++F src/where.c f6c34b6a7548a074f776ad6c3878f5f38c66178c
 +F src/whereInt.h 1fca2f8c649f0ee38fd52332659d0e7deb11d428
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7
@@@ -833,7 -817,7 +837,7 @@@ F test/randexpr1.test eda062a97e60f9c38
  F test/rdonly.test 64e2696c322e3538df0b1ed624e21f9a23ed9ff8
  F test/regexp1.test 497ea812f264d12b6198d6e50a76be4a1973a9d8
  F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
- F test/releasetest.tcl 1ed00e5e59cde1147868d458fb236f302ce64289
 -F test/releasetest.tcl 7ad4fd49ae50c41ec7781815bdda8a8b278781d4
++F test/releasetest.tcl e340abab899d4b8bdd87ff434e10a83ebe38c5ac
  F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
  F test/rollback.test 458fe73eb3ffdfdf9f6ba3e9b7350a6220414dea
  F test/rollback2.test fc14cf6d1a2b250d2735ef16124b971bce152f14
@@@ -916,10 -900,12 +920,12 @@@ F test/speed3.test d32043614c08c53eafdc
  F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
  F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
  F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
 -F test/speedtest1.c 2b416dca3a155fcaa849540b2e7fc1df12896c23
 +F test/speedtest1.c 9f1b745c24886cced3f70ffc666300152a39013c
  F test/spellfix.test 24f676831acddd2f4056a598fd731a72c6311f49
+ F test/sqldiff1.test e5ecfe95b3a2ff6380f0db6ea8bec246b675e122
  F test/sqllimits1.test e05786eaed7950ff6a2d00031d001d8a26131e68
- F test/stat.test 76fd746b85459e812a0193410fb599f0531f22de
+ F test/stat.test 8de91498c99f5298b303f70f1d1f3b9557af91bf
+ F test/statfault.test f525a7bf633e50afd027700e9a486090684b1ac1
  F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9
  F test/subquery.test d7268d193dd33d5505df965399d3a594e76ae13f
  F test/subquery2.test 438f8a7da1457277b22e4176510f7659b286995f
@@@ -936,7 -922,7 +942,7 @@@ F test/tclsqlite.test 7fb866443c7deceed
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
- F test/tester.tcl fd6771cc46ab13313ec6c9b602ffcd6876c8413f
 -F test/tester.tcl 51211254f2ee2340d3e4fa0a83bd5381b9e1a227
++F test/tester.tcl c18dbf42f4b0c1fb889b0efeb8a59d5143dd9828
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1237,7 -1223,7 +1243,7 @@@ F tool/mkopts.tcl 66ac10d240cc6e86abd37
  F tool/mkpragmatab.tcl 94f196c9961e0ca3513e29f57125a3197808be2d
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 69bae8ce4aa52d2ff82d4a8a856bf283ec035b2e
- F tool/mksqlite3c.tcl 9f664f73301ad91ab8ff8886f35152293c564b17
 -F tool/mksqlite3c.tcl 10c06c9c616415c0269c13a33304a75e3c319c3f
++F tool/mksqlite3c.tcl fdeab4c1eed90b7ab741ec12a7bc5c2fb60188bd
  F tool/mksqlite3h.tcl 44730d586c9031638cdd2eb443b801c0d2dbd9f8
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl 3b58b9398f91c7dbf18d49eb87cefeee9efdbce1
@@@ -1272,7 -1258,7 +1278,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 1506e99eca19f72fb59b55ec9e2534505dfa7a6e
- R 5fcb34c1c4f5453896bfec967f317705
 -P b33f1bacfdb34fe66b7b073e68bfac38498d6e88
 -R 786cf9bafb843a30daaea508385a36b1
 -U mistachkin
 -Z cf0d8cd171ac487c0fd87c289759c254
++P a1a2b4a2eff4f641fa80e8ffa805c97afb73be95 59e3e9e764440b7feaafadff74f422535d21bca2
++R 99aa698777c431a187136d57fa029547
 +U dan
- Z 1b150381fd804dab419a02d028d557d7
++Z e3088dd5ab91fa476cb3a2799f3523a3

diff --cc manifest.uuid
index 0fa4dca70be3c0a58419363419f840bb273808e3,af09740391caad5f8097efb6a468eab85473077d..3068b18c4985ed4fa7556587099994080bf61196
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a1a2b4a2eff4f641fa80e8ffa805c97afb73be95
 -59e3e9e764440b7feaafadff74f422535d21bca2
++299ed55c909d327826ef47e204ef1e9afd54852b

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

diff --cc src/tclsqlite.c
Simple merge

diff --cc src/where.c
Simple merge

diff --cc test/releasetest.tcl
index 18eefc7a9c098d51fd29cfa27373611ff1031d8f,a429d83cab1275da83457c62fe83043c86396df6..2efce04c657efc8c91a7beefadcac2565eab8e4f
--- 1/test/releasetest.tcl
--- 2/test/releasetest.tcl
+++ b/test/releasetest.tcl
@@@ -108,7 -109,13 +109,14 @@@ array set ::Configs [strip_comments 
      -DSQLITE_ENABLE_MEMSYS3=1
      -DSQLITE_ENABLE_COLUMN_METADATA=1
      -DSQLITE_ENABLE_STAT4
+     -DSQLITE_MAX_ATTACHED=125
+   }
+   "Fast-One" {
+     -O6
+     -DSQLITE_ENABLE_FTS4=1
+     -DSQLITE_ENABLE_RTREE=1
+     -DSQLITE_ENABLE_STAT4
 +    -DSQLITE_ENABLE_OTA
      -DSQLITE_MAX_ATTACHED=125
    }
    "Device-One" {

diff --cc test/tester.tcl
Simple merge

diff --cc tool/mksqlite3c.tcl
index f9d1fb0fdb49605236a9a647a64b87e7b53b482d,0c2f3e7aaeb907a38aa73577fa8add610413da42..0f1f8a4fce5997943b180dafa45fd36a4b1f803f
--- 1/tool/mksqlite3c.tcl
--- 2/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@@ -367,7 -368,7 +369,8 @@@ foreach file 
     rtree.c
     icu.c
     fts3_icu.c
 +   sqlite3ota.c
+    dbstat.c
  } {
    copy_file tsrc/$file
  }