From: drh <drh@noemail.net>
Date: Fri, 22 May 2015 23:51:30 +0000 (+0000)
Subject: Merge bug fixes from trunk.
X-Git-Tag: version-3.13.0~148^2~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eafdd672428d9ddd213428c736d3a9046397d1a7;p=thirdparty%2Fsqlite.git

Merge bug fixes from trunk.

FossilOrigin-Name: 519054bb72e8f8977b11161c81b0e96ba7bca589
---

eafdd672428d9ddd213428c736d3a9046397d1a7
diff --cc manifest
index 2d84c736a7,ee169cdc43..365d439600
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\senhancements\sfrom\strunk,\sincluding\sthe\snew\ssqlite3_value_dup()\sAPI\sand\nthe\saddition\sof\sthe\sapSqlParam\sfield\sin\sthe\ssqlite3_rtree_query_info\sobject\nof\sR-Tree.
- D 2015-05-22T23:26:18.963
 -C Improved\serror\smessages\sin\sfuzzershell\swhen\sunable\sto\sopen\sthe\sdatabase.
 -D 2015-05-22T23:50:19.667
++C Merge\sbug\sfixes\sfrom\strunk.
++D 2015-05-22T23:51:30.691
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 0a6ae26396ec696221021780dffbb894ff3cead7
 +F Makefile.in 66db4ec2c6cd63d0f3e29d366aaaab769aba175b
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 55fdbee85598e2c61fc1e643d02f38f1f943463c
 +F Makefile.msc ea72907f6c4b92181dd6dfca665253025705d85f
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 0bfccb18927349653c09137a458b961fa8ab4cb9
  F VERSION ce0ae95abd7121c534f6917c1c8f2b70d9acd4db
@@@ -1297,7 -1278,7 +1297,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 7530e1bf557083ef91447a02f05b019dbe60fa70 10cc44f5a63e6cadf6940bb7310a177ee7fa6ee2
- R a152f3a145c4384cb72a92d8f9b69eb6
 -P 745deab87adc378a5376aaa9451fb9485bc2f4c4
 -R 7f1ec43795b4d42a65936d3bb7f0111c
++P cdc0ca6fb36e787b981fb544a27c6df838f85704 c404fcace83613a50015f15097b7f28123c221c3
++R 957ffe62dcf25805db0612a32b474c17
  U drh
- Z 209f039a515a9e78b61cf9368c3a92c3
 -Z e4cfba910ab91f4d7a3f152da8ecf0bd
++Z cbbadb818c188a30c0fd9c403a8bf4fd
diff --cc manifest.uuid
index c37ac1326d,18711cc258..ef15aee619
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- cdc0ca6fb36e787b981fb544a27c6df838f85704
 -c404fcace83613a50015f15097b7f28123c221c3
++519054bb72e8f8977b11161c81b0e96ba7bca589