From: dan <dan@noemail.net>
Date: Tue, 25 Aug 2015 11:16:02 +0000 (+0000)
Subject: Merge latest trunk changes with this branch.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c40ed42814ff10ac30b1870c42c51bd180ec32e;p=thirdparty%2Fsqlite.git

Merge latest trunk changes with this branch.

FossilOrigin-Name: 3e7d6dd62dfa63d7def00bd00ac055a606a0c80d
---

3c40ed42814ff10ac30b1870c42c51bd180ec32e
diff --cc manifest
index ee49634063,dc6880d48e..acbd257352
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Remove\sduplicated\sline\sof\scode.
- D 2015-08-24T22:06:02.586
 -C Fix\sa\smemory\sleak\sthat\smight\soccur\swhen\scompiling\swith\sSQLITE_OMIT_CHECK.
 -D 2015-08-25T00:34:54.628
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2015-08-25T11:16:02.604
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in e2218eb228374422969de7b1680eda6864affcef
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -279,10 -279,10 +279,10 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 4d9134dc988a87838c06056c89c0e8c4700a0452
  F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
 -F src/btree.c f48b3ef91676c06a90a8832987ecef6b94c931ee
 -F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
 -F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0
 -F src/build.c 6debb6244f38bdcadaed1042a71bdb8e6a471daf
 +F src/btree.c f4db20fab7bf5ebd9f12ef7e3a925ca3c2c34fa8
 +F src/btree.h 00d4cdb747c4172a5566faf037116985dbbc377e
 +F src/btreeInt.h 171864bcd81635583dab7b8a04b19b454b18ef80
- F src/build.c 2890c89e0dc274171c18195ff2a6364be47c2b1d
++F src/build.c 1b5814e0eeaba096ae3ee17ebd139d2a25af7250
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
@@@ -324,9 -324,9 +324,9 @@@ F src/os_setup.h c9d4553b5aaa6f73391448
  F src/os_unix.c 388c023582b17890f10c980b30ec1922b471753b
  F src/os_win.c 40b3af7a47eb1107d0d69e592bec345a3b7b798a
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c aa916ca28606ccf4b6877dfc2b643ccbca86589f
 -F src/pager.h 6d435f563b3f7fcae4b84433b76a6ac2730036e2
 -F src/parse.y f599aa5e871a493330d567ced93de696f61f48f7
 +F src/pager.c 2e2559e64e825e39c033c0744237733cec70d636
 +F src/pager.h 1335b624cd540815c8c977172589d208d1c251a6
- F src/parse.y dc3dda4b191ed54ae7d3662ffc9ee21ba91850ae
++F src/parse.y 1e645cacb93979c59f2a510ee2c100e769bd5e3c
  F src/pcache.c cde06aa50962595e412d497e22fd2e07878ba1f0
  F src/pcache.h 9968603796240cdf83da7e7bef76edf90619cea9
  F src/pcache1.c a3fe31b17e841ec70beee72a2c960e9c787a8857
@@@ -342,7 -342,7 +342,7 @@@ F src/shell.c b1f91e60918df3a68efad1e3a
  F src/sqlite.h.in 378bebc8fe6a88bade25e5f23b7e6123fdc64b00
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h f700e6a9dd1fdcccc9951ab022b366fb66b9e413
- F src/sqliteInt.h 54c3393fc26737db60ed369881d91fa54b71987d
 -F src/sqliteInt.h edbcd0c0787541a636a25ab1d1eaf847dbd043f1
++F src/sqliteInt.h 0b77fa98404807709549d43387f9b44e3c69d5b7
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -1381,7 -1379,7 +1381,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 ba1ab858e2997c88dd7eee6e6893a8616d85c665
- R 9abcd1f9df86b1795253bff8998d1e7d
- U mistachkin
- Z ced970d02bef7e6e65b8cf8ae80899c7
 -P bdaf66465b6b1bdad10c08d9527b98e7000a41e4
 -R c205d3ef222cb4a1d4248bf7f5251545
 -U drh
 -Z 581df61ac20e484fcd60729c96ccadec
++P 47280f2a2b7cc83bf11ab86284204f565c278c55 8f1d9f1f308518522ebb1eaebb9b184b4ac30924
++R 4996e84b0ad088ebe2e29da93ebd1db4
++U dan
++Z 753c22f173f485729e70306b30e77d72
diff --cc manifest.uuid
index 408e86fc5b,ebcb1d830a..fa55886f4f
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 47280f2a2b7cc83bf11ab86284204f565c278c55
 -8f1d9f1f308518522ebb1eaebb9b184b4ac30924
++3e7d6dd62dfa63d7def00bd00ac055a606a0c80d