From: drh <drh@noemail.net>
Date: Tue, 28 Sep 2010 17:37:44 +0000 (+0000)
Subject: Merge accidental fork.
X-Git-Tag: version-3.7.4~129
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=c98a4c6db70647455338f5a2b04007cefbd34789;p=thirdparty%2Fsqlite.git

Merge accidental fork.

FossilOrigin-Name: 33c8b9c710db6a1a987c11ab6f3a6bc120257ce9
---

c98a4c6db70647455338f5a2b04007cefbd34789
diff --cc manifest
index d33d4dc49b,58b26217e5..7fee650617
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,8 +1,8 @@@
- C Add\stests\sto\se_createtable.test.\sAllow\sa\stable\sto\sbe\screated\sif\sthere\sis\san\sindex\sof\sthe\ssame\sname\sin\sa\sdifferent\sattached\sdatabase.
- D 2010-09-28T17:37:28
+ -----BEGIN PGP SIGNED MESSAGE-----
+ Hash: SHA1
+ 
 -C Get\sANALYZE\sworking\sagain\swith\s-DSQLITE_ENABLE_STAT2\sand\svirtual\stables.
 -D 2010-09-28T17:34:46
++C Merge\saccidental\sfork.
++D 2010-09-28T17:37:44
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -868,7 -871,14 +871,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
--P dd1b34bab7edaaedd985882f6e16b16940a46d38
- R 9a005e09da83e134e84a9a0916725a2c
- U dan
- Z d38832569685f81301ba56b0f91fcdf4
 -R 1463f4693d4e0abbc27bfcfd5adba4a4
++P 6251e587403eed822b9011ed25a3a807e8fa2a6f b7a26427afc43c9bbdf365b775379eb57187bc97
++R 2150b8665a4d77e688c620ae74088521
+ U drh
 -Z 63582f977f7a2fd2da752e2048dc9c5c
++Z 4d3d211ea9c5b7e168f16846e8aa0e05
+ -----BEGIN PGP SIGNATURE-----
+ Version: GnuPG v1.4.6 (GNU/Linux)
+ 
 -iD8DBQFMoic5oxKgR168RlERAolQAJ49CRE/+QjrZGusXzf5RC3/aleugwCghMVL
 -OuSXAsSEDXHLGVDa/3cyGSM=
 -=nrqa
++iD8DBQFMoifwoxKgR168RlERAthxAJ9/+RgDqmxkVpzT2RPcQd3+CRfM5ACcC32K
++xVhEbt+a4I3tqHSMWTuKYOw=
++=ku2K
+ -----END PGP SIGNATURE-----
diff --cc manifest.uuid
index 65a806ae8b,e8294704c9..a8dfd29b68
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6251e587403eed822b9011ed25a3a807e8fa2a6f
 -b7a26427afc43c9bbdf365b775379eb57187bc97
++33c8b9c710db6a1a987c11ab6f3a6bc120257ce9