From: drh <drh@noemail.net>
Date: Fri, 28 Mar 2014 18:35:39 +0000 (+0000)
Subject: Merge the latest changes from trunk.
X-Git-Tag: version-3.8.7~132^2~95^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c8e9c78c8e2a3fc2d75ec3d3cbc6c692cd18349;p=thirdparty%2Fsqlite.git

Merge the latest changes from trunk.

FossilOrigin-Name: 3047a25f1c41e83f0b4772f7c36fbfec0f12dc7e
---

7c8e9c78c8e2a3fc2d75ec3d3cbc6c692cd18349
diff --cc manifest
index 986addf1fe,52d212de1d..a3dc17de19
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Instead\sof\sallocating\sa\ssingle\slarge\sbuffer\sat\sthe\sbeginning\sof\seach\ssort\soperation,\sstart\swith\sa\ssmall\sbuffer\sand\sextend\sit\susing\srealloc()\sas\srequired.
- D 2014-03-27T19:25:02.222
 -C Disable\sthe\swal64k.test\sscript\sfor\snon-unix\ssystems\ssince\sit\sdepends\son\nunix-only\sfeatures.
 -D 2014-03-28T14:41:35.536
++C Merge\sthe\slatest\schanges\sfrom\strunk.
++D 2014-03-28T18:35:39.779
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -278,14 -278,14 +278,14 @@@ F src/update.c 5b3e74a03b3811e586b4f2b4
  F src/utf.c 6dc9ec9f1b3db43ae8ba0365377f11df1ee4c01c
  F src/util.c c46c90459ef9bdc0c6c73803cf4c55425b4771cf
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
 -F src/vdbe.c 74c7386e83eee56f921a17bb4a0396c9551f5bc7
 +F src/vdbe.c 02f2de0b2f3b198438e3e64a2ceba9407bb8348b
- F src/vdbe.h fb2c48c198300a7c632f09fc940011d2ad2fc2ae
- F src/vdbeInt.h 2b9a6849166d0014c843ae3fd83a062be4efa325
+ F src/vdbe.h 394464909ed682334aa3d5831aae0c2fe2abef94
+ F src/vdbeInt.h e6d83e5bfd62fc6685ba1ed6153f7099f82de9f7
  F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
- F src/vdbeaux.c f81ef920dcf76aceaa1ce77081e9fc5d7a0993dd
+ F src/vdbeaux.c 1153175fb57a8454e1c8cf79b59b7bf92b26779d
  F src/vdbeblob.c 15377abfb59251bccedd5a9c7d014a895f0c04aa
  F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
 -F src/vdbesort.c 4abb7c0f8f19b7d7d82f4558d5da1a30fdf9ea38
 +F src/vdbesort.c 08d5e1ee199599d9571942f0560f84963c7a1a9b
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
  F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
  F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
@@@ -1159,7 -1159,7 +1159,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 f4ac1bf28c4ba395ccab8f1c9df72614a61095a7
- R 5fefa7763a5f0d580046ba5219de21a5
- U dan
- Z 8f7301353335dd4530b24cac1ad9c37a
 -P a4e47150f32b3a4120b1f89ccc66d633d829e3bb
 -R 578568415288cd31fe0adba6128329da
++P 81987c8ceb64f051528a6ca42673821d9ab7c0ff 27deb6e49bcc76714dbdc61b34748603155ac770
++R 79fcad4572db3d584834fdf0de4170a6
+ U drh
 -Z 045e2748905f8bd05ecf1197b97d7f20
++Z 871d90dec169e4d494b7ff32475fff97
diff --cc manifest.uuid
index cf2496b0b2,d9c988d4d5..518ac58c2a
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 81987c8ceb64f051528a6ca42673821d9ab7c0ff
 -27deb6e49bcc76714dbdc61b34748603155ac770
++3047a25f1c41e83f0b4772f7c36fbfec0f12dc7e