From: dan <dan@noemail.net>
Date: Sat, 1 Mar 2014 19:45:23 +0000 (+0000)
Subject: Merge trunk changes.
X-Git-Tag: version-3.8.4~34^2~2^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7e065fcf7df8e5db571fe345b7ec193bb8e23561;p=thirdparty%2Fsqlite.git

Merge trunk changes.

FossilOrigin-Name: 9c1747b5ded995e77fdab2fa9d334ec3c17c7c14
---

7e065fcf7df8e5db571fe345b7ec193bb8e23561
diff --cc manifest
index 08b453f312,3686379a18..53024362d5
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Remove\sthe\svdbeRecordCompareLargeHeader\sfunction.\sFix\ssome\sother\sdetails.
- D 2014-03-01T19:44:56.574
 -C In\sthe\scommand-line\sshell\sadd\sthe\s(undocumented\sand\sunsupported)\s".eqp"\ncommand\sand\s-eqp\scommand-line\soption,\sto\scause\sEXPLAIN\sQUERY\sPLAN\sto\sbe\nrun\son\seach\sSQL\sstatement\sas\sit\sis\sevaluated.\s\sIntended\suse\sis\sfor\sanalysis\nof\sthe\squery\splanner.
 -D 2014-02-28T20:47:24.221
++C Merge\strunk\schanges.
++D 2014-03-01T19:45:23.403
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1152,7 -1152,7 +1152,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 3a09f5605ac7c6e503eb10acfdc607010414d917
- R b23b5e438c1d698174ad52d7cfba370e
 -P 0a3579d9b9d2a60bb85a9811bc7936edb88debae
 -R 195e6e751f71ffa9e9cfd28d6f8e532d
 -U drh
 -Z d48791979092ee78fb00c8a21c663b3b
++P 3861e853105cb8da344c7eebd2e455622b26395e e6ecf7337658624d664e1e71ba3fc527fd6578c1
++R 13381de2688abf03e4d159f3d590d98e
 +U dan
- Z 35d9cecacf0cc917a2c2ed9a75b36eab
++Z e204c923f296e27176558f8973bbdd9c
diff --cc manifest.uuid
index 54a81caa10,6108cf5bed..36e6abe0e1
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3861e853105cb8da344c7eebd2e455622b26395e
 -e6ecf7337658624d664e1e71ba3fc527fd6578c1
++9c1747b5ded995e77fdab2fa9d334ec3c17c7c14