From: dan <dan@noemail.net>
Date: Wed, 27 Oct 2010 18:10:00 +0000 (+0000)
Subject: Merge experimental fts3/fts4 changes with trunk.
X-Git-Tag: version-3.7.4~86
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c09b78d83ea6d122887c4c6d16a24a76df1da29;p=thirdparty%2Fsqlite.git

Merge experimental fts3/fts4 changes with trunk.

FossilOrigin-Name: 988164cf485300fb3d189fd1453c23c48e737e24
---

6c09b78d83ea6d122887c4c6d16a24a76df1da29
diff --cc manifest
index d5f6fc1576,8fbcf3fb0e..22e7171352
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,5 +1,5 @@@
- -----BEGIN PGP SIGNED MESSAGE-----
- Hash: SHA1
- 
- C Fix\sa\smemory\sleak\sin\sthe\supdate_hook\smethod\sof\sthe\sTCL\sinterface.
- D 2010-10-27T15:36:22
 -C Fix\sa\sbuffer\soverread\sin\sfts3\sthat\scan\soccur\sif\sthe\sdatabase\sis\scorrupt.
 -D 2010-10-27T16:52:27
++C Merge\sexperimental\sfts3/fts4\schanges\swith\strunk.
++D 2010-10-27T18:10:00
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2c8cefd962eca0147132c7cf9eaa4bb24c656f3f
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -176,16 -174,16 +174,16 @@@ F src/printf.c 8ae5082dd38a1b5456030c37
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
 -F src/select.c 6a5c72fb0e8dc7f6133f5a9d7a747130ef0a00ea
 +F src/select.c a03ec6a313ef8311f081ee478f96ae04ff691608
  F src/shell.c 8517fc1f9c59ae4007e6cc8b9af91ab231ea2056
- F src/sqlite.h.in 13f219b9ab78f22603019fd193f09d5c8913795a
+ F src/sqlite.h.in 0c3ab42eef59ee80c564be76c700b542ff530758
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
  F src/sqliteInt.h c63b0340dfdfde18ff255ddccf004edd2d073288
  F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
  F src/status.c 496913d4e8441195f6f2a75b1c95993a45b9b30b
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
 -F src/tclsqlite.c e91019fb6787166abca23a81b16c07fecc2ed751
 +F src/tclsqlite.c dc71e2bd0f16dbb9106c1f5e257a64b783574f26
- F src/test1.c cbedc6ea7905b1361db054fbf7fcd0dafb6d844e
+ F src/test1.c a0d7c2b4d660195684d67ab8f65e4afcb301315b
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 056093cfef69ff4227a6bdb9108564dc7f45e4bc
  F src/test4.c 0528360b5025688002a5feb6be906ddce52eaaee
@@@ -876,14 -880,7 +880,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P f000ac1e52f56f5fcbc2f8b9cd632656c6dc6002
- R 87bd2b19f4ca2bca07ea5dcbd74b31a3
- U drh
- Z 479ea04ee8e630a3733354d872bb80c9
- -----BEGIN PGP SIGNATURE-----
- Version: GnuPG v1.4.6 (GNU/Linux)
- 
- iD8DBQFMyEb5oxKgR168RlERAvL+AJ4udNOfHX94MZFfKRriPPbqDCuqVQCaA/SV
- OqyW54Uozr4uOZ/lWO5idRc=
- =GHn4
- -----END PGP SIGNATURE-----
 -P 941647d121ac60e2eabc998cfe79b157fb918d7e
 -R 4228d3b4dbf28842cbc96083972fc4a8
++P 1d17e3dc832d789c3665e240dac5019fc4f9c18b 84194c4195d7144ff7f9cedcdc74fdd908f3bfcd
++R f5458d5dca6a9349d1464c43399f49c5
+ U dan
 -Z 82331704b60d2b02d0a92d3a85b091f9
++Z 7b142e7483efc834f35721c2c5038944
diff --cc manifest.uuid
index 420b3c45f2,ae661d2bc4..bac10b2df3
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 1d17e3dc832d789c3665e240dac5019fc4f9c18b
 -84194c4195d7144ff7f9cedcdc74fdd908f3bfcd
++988164cf485300fb3d189fd1453c23c48e737e24