From: drh <drh@noemail.net>
Date: Wed, 26 Mar 2014 19:45:01 +0000 (+0000)
Subject: Merge from trunk the fix for the crash on a corrupt database.
X-Git-Tag: version-3.8.7~132^2~96
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=664eb14d8ef282d6dbb11a6cc6e761a89f438702;p=thirdparty%2Fsqlite.git

Merge from trunk the fix for the crash on a corrupt database.

FossilOrigin-Name: 8cb2b02baa7ef9aa96319e977f0315328f944237
---

664eb14d8ef282d6dbb11a6cc6e761a89f438702
diff --cc manifest
index d29d622a2f,fed419c7cf..9e18b49726
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Enable\sfour\ssorting\sthreads\sby\sdefault\sin\sthe\scommand-line\sshell.
- D 2014-03-25T14:12:16.989
 -C Add\san\sextra\stest\scase\sfor\sthe\spotential\sbuffer\soverread\spatched\sby\s[28ddecff04].
 -D 2014-03-26T15:14:59.762
++C Merge\sfrom\strunk\sthe\sfix\sfor\sthe\scrash\son\sa\scorrupt\sdatabase.
++D 2014-03-26T19:45:01.037
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 +F Makefile.in ad0921c4b2780d01868cf69b419a4f102308d125
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc fdacba6fb574868c71fde6db6b77789a383a4c19
 +F Makefile.msc 153eb9b9725bc7b8e4dbe963219298e0c4a644b0
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 9f823c026c6a32fc5f84d212a8aae0a221dba45c
@@@ -283,10 -282,10 +283,10 @@@ F src/vdbe.c 74c7386e83eee56f921a17bb4a
  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 c3e427de848b78e9e9feaa25f68fb64686bab6cd
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
  F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
  F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
@@@ -1160,7 -1159,7 +1160,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 b415dfb6cb0df0c69992ca2bb700c15664f158e6
- R a4b6dbfcec045a7fea4740daec225662
 -P 2b28e8d582cf10936fa1faca04a16ca2eeead66f
 -R 76c12b0a4284d7654cb2771b2fc9c8eb
 -U dan
 -Z 22c3e1f8cdae5a20dae420dc313d8edd
++P 1cab83577c814feb35b4fb91af0d52a9751d99bc f585f5d7a0f9bf8c590388654a3638231eba8892
++R 60773da8b0081a052cb0d48785e94e94
 +U drh
- Z a12cd4438cfae19c4441f02ed27b5761
++Z 140bbab50f5dc3d30ae8cb405819380a
diff --cc manifest.uuid
index e0e5369892,bdc4496d4e..480b98fe06
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 1cab83577c814feb35b4fb91af0d52a9751d99bc
 -f585f5d7a0f9bf8c590388654a3638231eba8892
++8cb2b02baa7ef9aa96319e977f0315328f944237