From: dan <dan@noemail.net>
Date: Thu, 14 May 2015 09:53:17 +0000 (+0000)
Subject: Merge changes from the index-is-operator branch into this one. Drop the partial suppo... 
X-Git-Tag: version-3.8.11~252^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2bbb62ce0b0b74255799983205afd75449ad8f8d;p=thirdparty%2Fsqlite.git

Merge changes from the index-is-operator branch into this one. Drop the partial support added for IS on this branch by [52e73eec].

FossilOrigin-Name: 16ab9cafd00ea5df7e6f75d6a6740237828b888d
---

2bbb62ce0b0b74255799983205afd75449ad8f8d
diff --cc manifest
index 42b773b53f,438ec23110..a6b879d5f9
--- a/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
- D 2015-05-14T08:58:52.919
 -C A\snew\simplementation\sof\sindexing\swith\sthe\sIS\soperator\sthat\sworks\scorrectly\nwhen\sthe\sIS\soperator\sis\sin\sthe\sWHERE\sclause\sand\sthe\soperands\sare\sfrom\s\nopposite\ssides\sof\sa\sLEFT\sJOIN.
 -D 2015-05-14T01:05:25.274
++C Merge\schanges\sfrom\sthe\sindex-is-operator\sbranch\sinto\sthis\sone.\sDrop\sthe\spartial\ssupport\sadded\sfor\sIS\son\sthis\sbranch\sby\s[52e73eec].
++D 2015-05-14T09:53:17.998
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in edfc69769e613a6359c42c06ea1d42c3bece1736
 +F Makefile.in 0a6ae26396ec696221021780dffbb894ff3cead7
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc a9fd7fd02265aa5b3b2522f5e39d975972ff906d
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
@@@ -1278,7 -1258,7 +1278,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P a1a2b4a2eff4f641fa80e8ffa805c97afb73be95 59e3e9e764440b7feaafadff74f422535d21bca2
- R 99aa698777c431a187136d57fa029547
 -P 95b1f9bf14e490c6c6bba9ea78aeab712a44aab5
 -R 6e0cd1da1bcd5d739d5d402ab5201f6c
 -U drh
 -Z 3608a708c2f560b3e002545b6da23dda
++P 299ed55c909d327826ef47e204ef1e9afd54852b 4541688b3f56f5cd3d5b299594b58c577ad633bb
++R 96734f4874808ce7aff82ba236a43ce7
 +U dan
- Z e3088dd5ab91fa476cb3a2799f3523a3
++Z 9103bcdd2c3cb4a21b9d182ff8a50bb5
diff --cc manifest.uuid
index 3068b18c49,2dcd8f7064..06e2671f5a
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 299ed55c909d327826ef47e204ef1e9afd54852b
 -4541688b3f56f5cd3d5b299594b58c577ad633bb
++16ab9cafd00ea5df7e6f75d6a6740237828b888d