From: drh <drh@noemail.net>
Date: Thu, 27 Mar 2014 00:09:00 +0000 (+0000)
Subject: Merge the latest trunk changes and the fix for the crash on a corrupt
X-Git-Tag: version-3.8.7~132^2~95^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bfa463696bbda4be7ce4f23da012faa28914b455;p=thirdparty%2Fsqlite.git

Merge the latest trunk changes and the fix for the crash on a corrupt
database.

FossilOrigin-Name: 0b35346c32dba14963c85ec178f2b46aa2bbf6dc
---

bfa463696bbda4be7ce4f23da012faa28914b455
diff --cc manifest
index e7a236ff5d,fed419c7cf..50b1f52a8e
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\senhancements\sand\sfixes\sfrom\strunk.
- D 2014-03-25T18:29:12.015
 -C Add\san\sextra\stest\scase\sfor\sthe\spotential\sbuffer\soverread\spatched\sby\s[28ddecff04].
 -D 2014-03-26T15:14:59.762
++C Merge\sthe\slatest\strunk\schanges\sand\sthe\sfix\sfor\sthe\scrash\son\sa\scorrupt\ndatabase.
++D 2014-03-27T00:09:00.185
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -282,10 -282,10 +282,10 @@@ F src/vdbe.c 02f2de0b2f3b198438e3e64a2c
  F src/vdbe.h fb2c48c198300a7c632f09fc940011d2ad2fc2ae
  F src/vdbeInt.h 2b9a6849166d0014c843ae3fd83a062be4efa325
  F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
- F src/vdbeaux.c 68dbdc77cdc008eeabc088b8b8a60aa743ba8d2a
+ F src/vdbeaux.c f81ef920dcf76aceaa1ce77081e9fc5d7a0993dd
  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
@@@ -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 d3e640afe611b6ae0b7f2cff5b00900d7e4d5ee3 9ab7ffd59209aef0ffbf384b3902a93fd3b86a6d
- R 335a8527f823954338585adf78102470
 -P 2b28e8d582cf10936fa1faca04a16ca2eeead66f
 -R 76c12b0a4284d7654cb2771b2fc9c8eb
 -U dan
 -Z 22c3e1f8cdae5a20dae420dc313d8edd
++P e005f2d6dd9faf38cc8fdb9428b5aa6192a6adae f585f5d7a0f9bf8c590388654a3638231eba8892
++R 9012cf758152dd3775ad665fff626f11
 +U drh
- Z 4f8dfdcfe6d8ef52977c5b1537285eeb
++Z ffbdc2f043e4deddac6c4b509aff14ac
diff --cc manifest.uuid
index a8da702225,bdc4496d4e..f8b9980e3d
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e005f2d6dd9faf38cc8fdb9428b5aa6192a6adae
 -f585f5d7a0f9bf8c590388654a3638231eba8892
++0b35346c32dba14963c85ec178f2b46aa2bbf6dc