From: drh <drh@noemail.net>
Date: Thu, 8 Apr 2010 01:16:19 +0000 (+0000)
Subject: Merge automatic index changes into the trunk.
X-Git-Tag: version-3.7.2~489
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c56f701992eca8e8430ed29dc78a1a98c0f6eda;p=thirdparty%2Fsqlite.git

Merge automatic index changes into the trunk.

FossilOrigin-Name: bf7b8d863665870a38f0b2335cc71de856a515b4
---

5c56f701992eca8e8430ed29dc78a1a98c0f6eda
diff --cc manifest
index dc0a0e8fea,9ce2db6894..9e4943d469
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
  -----BEGIN PGP SIGNED MESSAGE-----
  Hash: SHA1
  
- C When\srolling\sback\sa\ssavepoint\sto\sthe\sbeginning\sof\sthe\stransaction,\smake\ssure\nto\sinitialize\sthe\sdatabase\ssize\sin\sthe\sbtree\slayer\scorrectly\seven\sif\sthe\ndatabase\ssize\sfield\sof\sthe\sheader\sis\szeroed.
- D 2010-04-07T20:29:56
 -C When\sconstructing\sautomatic\sindices\sdo\snot\sinclude\sthe\ssame\scolumn\smore\sthan\nonce.
 -D 2010-04-08T00:40:15
++C Merge\sautomatic\sindex\schanges\sinto\sthe\strunk.
++D 2010-04-08T01:16:20
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -798,14 -799,14 +799,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P af3b72d94a1b6513f02402af3ada5fb5dd390151
- R f78c9929d17e46d2aa7049123364c764
 -P e388fe8be878c80ef0bfd1699a7268cdb22cb3c6
++P a3540c6acf2bb6bdd44c101b63f17ca85e6b68ed d067d9f7a9138e026c1018361127e34385928657
+ R 6de3d923fcac21cdb23f5cf757fdd27b
  U drh
- Z 4bb39b0a9403860754323008ca41f9d2
 -Z 6fc29309948fba281b52ea8a8b714933
++Z 5a775b8d77bdb4424d535d7f42dbf68e
  -----BEGIN PGP SIGNATURE-----
  Version: GnuPG v1.4.6 (GNU/Linux)
  
- iD8DBQFLvOtHoxKgR168RlERAr6UAJ9fo0g92PB14exEgBW5OrP0Aot84wCfZZHy
- n7PVWjhCjUBrl1g3CQG0QF4=
- =WMyU
 -iD8DBQFLvSXzoxKgR168RlERAjkFAJ9yq61smA3zQMYCS5Pw92gFWRWOugCfXsOv
 -Eb6E6s/NHeERjTzdhu0QrwQ=
 -=V5Mh
++iD8DBQFLvS5ooxKgR168RlERAsH0AJ9c22BUD9BphL4wVeIQE0+4NLYFKgCeInGI
++fyTJFbPX8dMPpCpst7eJaVo=
++=jJ9S
  -----END PGP SIGNATURE-----
diff --cc manifest.uuid
index 2798865464,65764d3697..fa334980d3
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a3540c6acf2bb6bdd44c101b63f17ca85e6b68ed
 -d067d9f7a9138e026c1018361127e34385928657
++bf7b8d863665870a38f0b2335cc71de856a515b4