From: shaneh <shaneh@noemail.net>
Date: Thu, 8 Jul 2010 16:50:08 +0000 (+0000)
Subject: Merged experimental crashsql() into trunk.
X-Git-Tag: version-3.7.2~153
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4677ddff7e3cf383370b9c2edadf3b9f528064b1;p=thirdparty%2Fsqlite.git

Merged experimental crashsql() into trunk.

FossilOrigin-Name: 01b575ff1aa512f34be78f9d67b6caaf825e5820
---

4677ddff7e3cf383370b9c2edadf3b9f528064b1
diff --cc manifest
index 01bb4fc86d,b479dc7cf1..b95c0359f9
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\swarning\sin\stest\sfixture\scode.
- D 2010-07-08T16:22:52
 -C Changes\sto\sget\scrashsql()\sworking\son\sWindows.
 -D 2010-07-08T16:30:44
++C Merged\sexperimental\scrashsql()\sinto\strunk.
++D 2010-07-08T16:50:08
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in c4270a1cd7cd70a263b7e96a258aa90e9c3618eb
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -832,7 -832,10 +832,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 6a46e64168705a31d86d29a60025f138a42c5b79
- R 230fc1c26046bb79cd79e6edb87e96df
 -P 0bfcf3bcd77acab48344dde87cecb01e877f1a19
++P 0bfcf3bcd77acab48344dde87cecb01e877f1a19 8a5811ea80e8415f9ba6b1d9390ed723840402c3
+ R 88877c3276846acf4750cafa5881b8d1
 -T *branch * experimental
 -T *sym-experimental *
 -T -sym-trunk *
  U shaneh
- Z 8fb65eb43637bb03cba7a83e60a48fb4
 -Z 1f67ba25d40232bd2a8d0c931fdbd5e8
++Z 9cb1c2ec419c9dc18b8023733894c905
diff --cc manifest.uuid
index 679a83ebaf,f67a1cf050..6b20b9c769
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0bfcf3bcd77acab48344dde87cecb01e877f1a19
 -8a5811ea80e8415f9ba6b1d9390ed723840402c3
++01b575ff1aa512f34be78f9d67b6caaf825e5820