From: dan <dan@noemail.net>
Date: Thu, 29 Mar 2012 15:11:32 +0000 (+0000)
Subject: Merge fts4-incr-merge with trunk.
X-Git-Tag: mountain-lion~3^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=06801f6ff04a69151801a8f568e243adf2a89dc6;p=thirdparty%2Fsqlite.git

Merge fts4-incr-merge with trunk.

FossilOrigin-Name: 4d6de3e9bef3487f2d89167939ab2c42872d05b3
---

06801f6ff04a69151801a8f568e243adf2a89dc6
diff --cc manifest
index 3caf718a94,da8c3778ae..eb8db26a7f
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Disable\sthe\sLIKE\soptimization\sif\sthe\scolumn\son\sthe\sleft-hand-side\sof\sthe\sLIKE\soperator\sbelongs\sto\sa\svirtual\stable.
- D 2012-03-29T14:29:07.705
 -C Merge\sin\sthe\slatest\schanges\sfrom\strunk.
 -D 2012-03-28T16:44:13.607
++C Merge\sfts4-incr-merge\swith\strunk.
++D 2012-03-29T15:11:32.438
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -993,7 -999,7 +999,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 4afdd5ae53ef0ff7c0fde74eaa04638c923c679b
- R def111c8a7bf40297c8914cb6a05a57c
 -P 64fc8b30f8bc7ddc697b6042040e958787ff3118 0733c98c329bc9942460746e9bbaf4b4c94c1520
 -R 7c6a56a142b783bc5a39759c4e6db58f
 -U drh
 -Z b8266c3b3b198b8b23ee6f1eee86b3bc
++P 0bacb879e18026f2a8e22fe3e4bc8d27de5c4416 66c4aaadda433c9d479a25c27cdff84560088402
++R 44c1548cf550b784321f894b0b9c8ec7
 +U dan
- Z 4348a3207684ec0ef401a834e1562981
++Z 991a128a11b720bb56ac07d77a5267e5
diff --cc manifest.uuid
index 611c0d9d53,a81fab47bf..035ce476f1
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0bacb879e18026f2a8e22fe3e4bc8d27de5c4416
 -66c4aaadda433c9d479a25c27cdff84560088402
++4d6de3e9bef3487f2d89167939ab2c42872d05b3