Merge in the IS-operator enhancements and other recent changes from trunk.

FossilOrigin-Name: 4f9229445c293b39c80b2a662901f608c85b36ef

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
index a2c5f1c00c292435b7ea67a8254bdb6f061493d9,cd39e48ab9086a8e3420ae0c3b0555fe83a479c3..1f003eac51f41aafde8a5177838f49d92bc402f9
--- 1/Makefile.msc
--- 2/Makefile.msc
+++ b/Makefile.msc
@@@ -1193,9 -1178,16 +1200,18 @@@ EXTHDR = $(EXTHDR) 
    $(TOP)\ext\icu\sqliteicu.h
  EXTHDR = $(EXTHDR) \
    $(TOP)\ext\rtree\sqlite3rtree.h
 +EXTHDR = $(EXTHDR) \
 +  $(TOP)\ext\session\sqlite3session.h
  
+ # executables needed for testing
+ #
+ TESTPROGS = \
+   testfixture.exe \
+   sqlite3.exe \
+   sqlite3_analyzer.exe \
+   sqldiff.exe
+ 
+ 
  # This is the default Makefile target.  The objects listed here
  # are what get build when you type just "make" with no arguments.
  #

diff --cc main.mk
Simple merge

diff --cc manifest
index 09d68aa497d399f9b10b5c7f289a0f0989cf0141,06d5eb49cfcb848c66efdfe72230afcc2f723565..4c953b09653314022e80dc65f7ac9bc88b3c4da9
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Merge\sin\sthe\s3.8.10\srelease\schanges.
- D 2015-05-07T12:29:54.271
 -C The\sIS\soperator\scan\snow\suse\sindexes\sthe\ssame\sas\sthe\s==\soperator.
 -D 2015-05-14T14:32:11.685
++C Merge\sin\sthe\sIS-operator\senhancements\sand\sother\srecent\schanges\sfrom\strunk.
++D 2015-05-14T15:17:20.176
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 114f5809eeff63855cfda99551addf1e00ef7730
 -F Makefile.in edfc69769e613a6359c42c06ea1d42c3bece1736
++F Makefile.in 73b64617bc169971c12be153e3ad9ef76e662fe4
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 6b0b04b6037ef272e8c1f2a24ccc0f99663dde14
 -F Makefile.msc a9fd7fd02265aa5b3b2522f5e39d975972ff906d
++F Makefile.msc 35200c2f470516f178392b0135375f656fdeac02
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
- F VERSION 2e244662b71e6e68a5c29b014ebc5b7564f4cc5a
+ F VERSION 8af05c43e00f7de32be74ff9984d792c96cdb0de
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -170,7 -152,7 +170,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk d8b3e198082720785408b7d99c2f45f749d1da7b
 -F main.mk d49723483ee9e4fb71dc2bd0e6be58705a481e73
++F main.mk a76e778116586db55895d3cc9796bde70bd9db08
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk d5e22023b5238985bb54a72d33e0ac71fe4f8a32
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -197,10 -179,10 +197,10 @@@ F src/btreeInt.h 973a22a6fd61350b454ad6
  F src/build.c 61b47073f79f31e80a05db9ce13c5ca81bf8f74e
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c a5cf5b4b56390cfb7b8636e8f7ddef90258dd575
- F src/ctime.c 98f89724adc891a1a4c655bee04e33e716e05887
+ F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
  F src/date.c e4d50b3283696836ec1036b695ead9a19e37a5ac
- F src/dbstat.c 1eacd310212b5ae59b7be645a06de8f8bbe0b5d6
+ F src/dbstat.c f402e77e25089c6003d0c60b3233b9b3947d599a
 -F src/delete.c 37964e6c1d73ff49cbea9ff690c9605fb15f600e
 +F src/delete.c 5075d88557eb4e2a7fdb2b61a96142830d8589b8
  F src/expr.c 3fb2ab3ab69d15b4b75ae53fceb4e317f64cb306
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c c9b63a217d86582c22121699a47f22f524608869
@@@ -214,8 -196,8 +214,8 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
  F src/loadext.c 29255bbe1cfb2ce9bbff2526a5ecfddcb49b9271
- F src/main.c 6b9b7976bd63b04b795f0eff6e07dcb019f56e97
- F src/malloc.c 6a370b83d54e4bbf6f94021221c2a311cff26a18
 -F src/main.c bf14bc6a321965e528d8ab30087e9440335f2e4b
++F src/main.c 3fd7ec2399ce67b7dda1b155925d95b8afe2b9ea
+ F src/malloc.c 5bc15d525811d387b37c29f2e368143460e41e96
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@@ -250,16 -232,16 +250,16 @@@ F src/random.c ba2679f80ec82c4190062d75
  F src/resolve.c 99eabf7eff0bfa65b75939b46caa82e2b2133f28
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c 1b0bfc7d59e48c26b895a6b719157111a617d9e3
- F src/shell.c a781037a81ac801495e06855605b444a8c5bd19b
- F src/sqlite.h.in 679a3abfef9c13a989728fd27f308a3e3f00e232
 -F src/shell.c 07dda7cd692911d2f22269953418d049f2e2c0ee
 -F src/sqlite.h.in bf3fe5eba3a5142477b8dae3cfce627c3e971455
++F src/shell.c f26cca96f7dadab5efb5e655edf548f4b91695c5
++F src/sqlite.h.in 0d711b199290c187b6013bc6b519ddc8ec36d4d8
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h 15960c3f5f682abb9ac1664c6bd9146d18d3f21d
 -F src/sqliteInt.h c9f77bd02f419dcc8c644c5032c42eb29069a545
++F src/sqliteInt.h 5f7643182e9da425d16a9ea4ad2264adf77c2c4e
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
- F src/tclsqlite.c d6952e9d739357ffe9bbfbda3832f6315f6271a2
- F src/test1.c 90fbedce75330d48d99eadb7d5f4223e86969585
 -F src/tclsqlite.c 9111a95999edac92229c972e2c34fbc171bbb6c5
++F src/tclsqlite.c 3e98ca80d7c0b66c2e89721ee263d1f396fad816
+ F src/test1.c a8e09b811f70184ce65012f27f30cfee7e54f268
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
  F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -1264,10 -1247,10 +1266,10 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
- F tool/sqldiff.c 10e3c01111f97b99627adf0954cf5ffbfba0723c
+ F tool/sqldiff.c 0748c0daed08f31e5a8eab6de98ca57500e61ecf
  F tool/stack_usage.tcl f8e71b92cdb099a147dad572375595eae55eca43
  F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d
 -F tool/symbols.sh fec58532668296d7c7dc48be9c87f75ccdb5814f
 +F tool/symbols.sh c5a617b8c61a0926747a56c65f5671ef8ac0e148
  F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
  F tool/varint.c 5d94cb5003db9dbbcbcc5df08d66f16071aee003
  F tool/vdbe-compress.tcl 5926c71f9c12d2ab73ef35c29376e756eb68361c
@@@ -1275,7 -1258,8 +1277,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 de7083cfe2bb00b689bec6bcc75e994f564ceda6 cf975957b9ae671f34bb65f049acf351e650d437
- R 2f55d0a58047aedd7e79d4671acd0f99
 -P 59e3e9e764440b7feaafadff74f422535d21bca2 f397c8622ae5a36a71f81d9f2549ca314005ece5
 -R bdc88e4814b826734527d4ac723cdd70
 -T +closed f397c8622ae5a36a71f81d9f2549ca314005ece5
++P 0404ef885e47f0df1daa04feb28452beb4d32a35 3428043cd00294457548bb07ada2ad526b6532d6
++R 25710cfb819c9f25a12055b84606adbc
  U drh
- Z 12d4e95f1926699d9a88cac43c727452
 -Z 2145c2897b1f3b7880cf6c9a6c38a0d4
++Z 9620c8120a371d7867c988796203e7a5

diff --cc manifest.uuid
index fab289e196826fe260d2a7bc357d40ff297fa2d5,6cf0e2c25d8203f72a2dd57d9f12d4c88436f337..0508c7aefe0793af30ef0ae6c0e3547de5a47320
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0404ef885e47f0df1daa04feb28452beb4d32a35
 -3428043cd00294457548bb07ada2ad526b6532d6
++4f9229445c293b39c80b2a662901f608c85b36ef

diff --cc src/main.c
Simple merge

diff --cc src/shell.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/tclsqlite.c
Simple merge