From: dan <dan@noemail.net>
Date: Thu, 19 Nov 2009 02:52:57 +0000 (+0000)
Subject: Merge the fts3-refactor branch with the trunk.
X-Git-Tag: fts3-refactor~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44e0d68c4434c72ada055cfe8b0a92b8d79a933a;p=thirdparty%2Fsqlite.git

Merge the fts3-refactor branch with the trunk.

FossilOrigin-Name: c8d2bd37a4c16154912a0831690584011dc230cb
---

44e0d68c4434c72ada055cfe8b0a92b8d79a933a
diff --cc manifest
index 985db36ac2,b5d538d16d..4837c6182c
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,8 +1,5 @@@
- C Fix\sproblems\sintroduced\sinto\sfts3\sas\spart\sof\sthe\srefactoring.
- D 2009-11-19T00:15:28
 ------BEGIN PGP SIGNED MESSAGE-----
 -Hash: SHA1
 -
 -C Performance\simprovement\sby\savoiding\sunnecessary\scalls\sto\smemset().
 -D 2009-11-18T23:01:26
++C Merge\sthe\sfts3-refactor\sbranch\swith\sthe\strunk.
++D 2009-11-19T02:52:58
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in 53f3dfa49f28ab5b80cb083fb7c9051e596bcfa1
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -772,7 -771,14 +772,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 2fe579e778b75fbf503c02e01e5424c1926f2b49
- R 876c3ff77bbdae620820b9bcd69de73e
 -P bf6c0bd1c5568c6292ea0a64c8a5071e1bd3079a
 -R 94c882b37dbcf4df81d200097ee8fbfb
 -U drh
 -Z b3176df7e21156fb3581aee8f7ad5f21
 ------BEGIN PGP SIGNATURE-----
 -Version: GnuPG v1.4.6 (GNU/Linux)
 -
 -iD8DBQFLBH37oxKgR168RlERAvTsAKCNI4hjKsYZ9AAT0Ncul8Hfw1/HcwCfdR+2
 -xaKwTs+NByafheeCCOovKPQ=
 -=EJ9B
 ------END PGP SIGNATURE-----
++P fa0998e19d984ee57f4f506c34eb858026cc49c3 85940468e6f93f7c493fbc129f13cf6233c5d0c0
++R 985cc2377284c202d1c7ecad2a54b0e2
 +U dan
- Z 2c58b81314d821564ee17bc92f6804a7
++Z 600804b7b33f5407e58df712974da46a
diff --cc manifest.uuid
index fd7e454a36,909f0247d1..36921c414f
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- fa0998e19d984ee57f4f506c34eb858026cc49c3
 -85940468e6f93f7c493fbc129f13cf6233c5d0c0
++c8d2bd37a4c16154912a0831690584011dc230cb