From: drh <drh@noemail.net>
Date: Thu, 13 Aug 2009 15:42:52 +0000 (+0000)
Subject: Merge the accidental fork.
X-Git-Tag: fts3-refactor~273
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3da9a940b73610fea21622c43d34a47f28d6f51d;p=thirdparty%2Fsqlite.git

Merge the accidental fork.

FossilOrigin-Name: 86a06dd0494c2fe83d4fde517557600956cedd9e
---

3da9a940b73610fea21622c43d34a47f28d6f51d
diff --cc manifest
index cad8cac98a,1c5d6ad440..276193c15b
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,5 +1,8 @@@
 -C Changes\sto\sthe\squery\splanner\sthat\simprove\sthe\sorder\sin\swhich\stables/indexes\sare\sscanned\sin\sjoin\squeries.
 -D 2009-08-13T07:09:33
 +-----BEGIN PGP SIGNED MESSAGE-----
 +Hash: SHA1
 +
- C Fix\sa\stypo\son\sa\scomment\sin\ssqlite3VdbeIntegerAffinity().
- D 2009-08-13T15:13:53
++C Merge\sthe\saccidental\sfork.
++D 2009-08-13T15:42:52
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in c606c9b502dfde3b9c3b2d23ed49f3737829693b
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -213,10 -210,10 +213,10 @@@ F src/vdbeInt.h 831c254a6eef237ef4664c8
  F src/vdbeapi.c 0ab8ada7260b32031ca97f338caecf0812460624
  F src/vdbeaux.c 4956536a636468fd07284028c39aab65ea99777e
  F src/vdbeblob.c a3f3e0e877fc64ea50165eec2855f5ada4477611
 -F src/vdbemem.c bfc25f9ef4fa914b473303566459552bdb2e008a
 +F src/vdbemem.c 364cfce843926224f917ab89ee476be958c864ed
  F src/vtab.c aedd76e8670d5a5379f93804398d3ba960125547
  F src/walker.c 1edca756275f158b80f20eb6f104c8d3fcc96a04
- F src/where.c 7e696d69a6d1b0fa277da2801ae4126dd4db0f8c
+ F src/where.c 53adef2c7b8bc888755cf41fb3449aedb36a429c
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
  F test/all.test 14165b3e32715b700b5f0cbf8f6e3833dda0be45
@@@ -745,14 -742,7 +745,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
- P 7f4810747b0864981f27edbd504bfab2efea1e3c
- R 655d909830158c1e4c23bcea01aa6d6f
 -P 1f0a93e17d6291268da909699ce1a5a7619ae637
 -R d962edbb5f58f48d082773e78b64bd00
 -U dan
 -Z 73a8cffe9b2f6a30befca6bd75c15499
++P b5a709d3609d40a6e5ef77f9889077d7395d3d26 19f799b32f9d1be25d4185ce18b13f4dd502e199
++R ab41ee398e311449a6447494098a83fa
 +U drh
- Z 17d73766b926eb2f8f7cfafceb82ffbd
++Z b589a26f62eacda54d72d773c2f21084
 +-----BEGIN PGP SIGNATURE-----
 +Version: GnuPG v1.4.6 (GNU/Linux)
 +
- iD8DBQFKhC20oxKgR168RlERAoiwAJ42KYNrKXAZVoTeDiGDP3EWje6GjACgji6w
- f06QEcTTR62jhYQgo4FrOOo=
- =xxUY
++iD8DBQFKhDR/oxKgR168RlERApwTAJ9tk5whkfe/L35NGftqAQgymtHvzgCeItIr
++T+WsDYk3Sl3YexQvu3qmYi8=
++=kIse
 +-----END PGP SIGNATURE-----
diff --cc manifest.uuid
index 793ff6cd3c,ff060f2167..de120d1768
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b5a709d3609d40a6e5ef77f9889077d7395d3d26
 -19f799b32f9d1be25d4185ce18b13f4dd502e199
++86a06dd0494c2fe83d4fde517557600956cedd9e