From: drh <drh@noemail.net>
Date: Tue, 25 Mar 2014 18:29:12 +0000 (+0000)
Subject: Merge enhancements and fixes from trunk.
X-Git-Tag: version-3.8.7~132^2~95^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6c7b09df69e854f5a96e17ce325bacf74565a19;p=thirdparty%2Fsqlite.git

Merge enhancements and fixes from trunk.

FossilOrigin-Name: e005f2d6dd9faf38cc8fdb9428b5aa6192a6adae
---

e6c7b09df69e854f5a96e17ce325bacf74565a19
diff --cc manifest
index eb635d79a8,d9f3760dc0..e7a236ff5d
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\sproblem\sin\sthe\scode\sadded\sby\s[707ea170b3]\scausing\svdbesort.c\sto\ssort\sunstably.
- D 2014-03-25T17:07:48.821
 -C Add\sanother\sperformance\stest\scase\sto\sspeedtest1.\s\sThis\scase\sis\sanother\nORDER\sBY\stest\sbut\sthis\stime\swithout\sLIMIT.
 -D 2014-03-25T17:45:49.623
++C Merge\senhancements\sand\sfixes\sfrom\strunk.
++D 2014-03-25T18:29:12.015
  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 42177064bd02fc55984aabc3a241368fda01e8b4
 -F src/vdbe.c 74c7386e83eee56f921a17bb4a0396c9551f5bc7
++F src/vdbe.c 02f2de0b2f3b198438e3e64a2ceba9407bb8348b
  F src/vdbe.h fb2c48c198300a7c632f09fc940011d2ad2fc2ae
  F src/vdbeInt.h 2b9a6849166d0014c843ae3fd83a062be4efa325
  F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
- F src/vdbeaux.c 5078ca7de4fd5ba4535bd17fe44d5b56c2d3294c
+ F src/vdbeaux.c 68dbdc77cdc008eeabc088b8b8a60aa743ba8d2a
  F src/vdbeblob.c 15377abfb59251bccedd5a9c7d014a895f0c04aa
  F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
 -F src/vdbesort.c 4abb7c0f8f19b7d7d82f4558d5da1a30fdf9ea38
 +F src/vdbesort.c 691f2186ae0943cd746ea7f5498cc9abebb7a7cc
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
  F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
  F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
@@@ -1157,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 c3ae3697832a00d4d5758988a8766bdbb691e6b8
- R eb749164f2115a0b3ef6dbb32fd74b6a
- U dan
- Z ecf1eb93a5e3757595a49ddb23f9c671
 -P 588122641e57e957813d329ea071e13ccbde5acd
 -R 6b6fe86503bb240eaed31036f5ef1e04
++P d3e640afe611b6ae0b7f2cff5b00900d7e4d5ee3 9ab7ffd59209aef0ffbf384b3902a93fd3b86a6d
++R 335a8527f823954338585adf78102470
+ U drh
 -Z 513f3088d16b4a60fe04e39489233db6
++Z 4f8dfdcfe6d8ef52977c5b1537285eeb
diff --cc manifest.uuid
index bb3b1adce9,0289c1d2a0..a8da702225
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d3e640afe611b6ae0b7f2cff5b00900d7e4d5ee3
 -9ab7ffd59209aef0ffbf384b3902a93fd3b86a6d
++e005f2d6dd9faf38cc8fdb9428b5aa6192a6adae