Merge trunk 3.8.8 beta changes into the sessions branch

FossilOrigin-Name: 0ba124540b5b2a9ceda0f4f4a46e6be54edad813

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
index 2f70bd9e47c21281be82e43b4bdccf1bce02cffc,4ebe9fd20cac901d378e20acc62d5d095cfbf988..72a4c1612c560ac8df4efb7d6bb4739d772e6e6d
--- 1/Makefile.msc
--- 2/Makefile.msc
+++ b/Makefile.msc
@@@ -1421,10 -1422,11 +1451,11 @@@ sqlite3session.lo:   $(TOP)\ext\session\s
  # hidden when the library is built via the amalgamation).
  #
  TESTFIXTURE_FLAGS = -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1
- TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE
+ TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_SERVER=1 -DSQLITE_PRIVATE=""
+ TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_CORE $(NO_WARN)
  
  TESTFIXTURE_SRC0 = $(TESTEXT) $(TESTSRC2) libsqlite3.lib
 -TESTFIXTURE_SRC1 = $(TESTEXT) $(SQLITE3C)
 +TESTFIXTURE_SRC1 = $(TESTEXT) $(TESTSRC3) $(SQLITE3C)
  !IF $(USE_AMALGAMATION)==0
  TESTFIXTURE_SRC = $(TESTSRC) $(TOP)\src\tclsqlite.c $(TESTFIXTURE_SRC0)
  !ELSE

diff --cc main.mk
Simple merge

diff --cc manifest
index 078c0b994111b32e8d8cf38330ceaa77e28f0d4f,d2eb0110ac51658d2d5ddd569ab5aff1e7ca3a7f..9ea8d11b02cee8d054c5d692e3ce993dc686ce98
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Merge\srecent\senhancements\sfrom\strunk,\sincluding\stest\sscripts\senhancements\sand\nthe\sremoval\sof\slimits\son\sthe\snumber\sof\sterms\sin\sa\sVALUES\sclause.
- D 2015-01-08T20:06:06.740
 -C Simplify\ssome\scode\sin\srtree,\sto\savoid\sconfusing\sthe\soptimizer\sin\sGCC\son\nsome\smacs:\ngcc\sversion\s4.2.1\s(Based\son\sApple\sInc.\sbuild\s5658)\s(LLVM\sbuild\s2335.15.00).\nPrior\sto\sthese\schanges,\scompiling\swith\s-O3\swould\scause\sincorrect\scode\sto\nbe\sgenerated.\s\sThe\schange\sto\sthe\snodeGetCell()\sroutine\sis\skey.\s\sThe\sother\nchanges\sare\smerely\scosmetic\sdetails\sdiscovered\swhile\sbug\shunting.
 -D 2015-01-13T21:26:17.584
++C Merge\strunk\s3.8.8\sbeta\schanges\sinto\sthe\ssessions\sbranch
++D 2015-01-14T17:16:23.588
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in a90b70e00180a16aae961b712583c854b265b1d5
 -F Makefile.in 9efcdb5c6025caea362cdfc38817451170fc6344
++F Makefile.in d187860ec4d0ea7b9b7ac38b12681bf9784d9ed0
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 883be4b5950a20bc7e4d72a49ffc5e5905728b54
- F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
 -F Makefile.msc 4c057774e6138b9023fc16ec05639ddd3329b152
++F Makefile.msc 8f8be3042579d7c0140b3c5cf6b2cf81959ac5c1
+ F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
  F VERSION d846487aff892625eb8e75960234e7285f0462fe
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -169,7 -152,7 +169,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 38ce97d3bcbaffe38869bd178a5f45124e4ee3ff
 -F main.mk 1d0cf88b6e89249608677215ad36e4f8a231accc
++F main.mk aa64e621e7e4b6a5db6186236d1c9c6522204cdd
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -196,10 -179,10 +196,10 @@@ F src/btreeInt.h a3d0ae1d511365e1a2b76a
  F src/build.c f5cfd7b32216f695b995bbc7c1a395f6d451d11f
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c 198a0066ba60ab06fc00fba1998d870a4d575463
- F src/ctime.c df19848891c8a553c80e6f5a035e768280952d1a
- F src/date.c 93594514aae68de117ca4a2a0d6cc63eddf26744
- F src/delete.c 20a360262b62051afacb44122b3593a8bd9be131
- F src/expr.c 00da3072f362b06f39ce4052baa1d4ce2bb36d1c
+ F src/ctime.c 98f89724adc891a1a4c655bee04e33e716e05887
+ F src/date.c e4d50b3283696836ec1036b695ead9a19e37a5ac
 -F src/delete.c bd1a91ddd247ce13004075251e0b7fe2bf9925ef
++F src/delete.c ba0a9915d533ffc72ed628bb7af577707e88a9ee
+ F src/expr.c 7be80f7dc337329a24df45c2f3bdb2ea3b64c90e
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c e0444b61bed271a76840cbe6182df93a9baa3f12
  F src/func.c 6d3c4ebd72aa7923ce9b110a7dc15f9b8c548430
@@@ -212,10 -195,10 +212,10 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
  F src/loadext.c 86bd4e2fccd520b748cba52492ab60c4a770f660
- F src/main.c 1b20d9b1b74d4c4183d7654a796b62f46e8b1cae
 -F src/main.c 05bf368c934cc73d02906030846eb4d1818c10f7
++F src/main.c e5bcc6d9cf791a25ebfa4e3029293ac56939824a
  F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
- F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
+ F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
  F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
  F src/mem5.c 61eeb90134f9a5be6c2e68d8daae7628b25953fb
@@@ -246,17 -230,17 +247,17 @@@ F src/random.c ba2679f80ec82c4190062d75
  F src/resolve.c f6c46d3434439ab2084618d603e6d6dbeb0d6ada
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c e4c38c75e36f28aed80a69a725d888751bfd53df
- F src/shell.c 81e4f2b57396db0714bc73d1f95cf3970f5dcc10
- F src/sqlite.h.in 08c35d8b77e65a54fd7e9819a7d8ceaf63a65d50
 -F src/shell.c 5b8e786a7c8eec87fa3f2ea615b337d2d99e284c
 -F src/sqlite.h.in 9dfc99d6533d36d6a549c4f3f01cacc8be956ada
++F src/shell.c ab438b98128dddee7eb60de63b67bbb5b9e7f4f5
++F src/sqlite.h.in 5b23162d86b48df8c3c95a340dead72bc61813f4
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h 892f2d3ba1f3b94572259addfc5a25f8db18c316
 -F src/sqliteInt.h eaf210295b551d4e40e622aec1b2261c0b28f844
++F src/sqliteInt.h ab9ee44bdeefe57b808cfbafc2dbdb08a189cb0e
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
- F src/tclsqlite.c 95452a59e1afd0cbce10d5243c480b0d5e1e5f59
- F src/test1.c 460d39e7abbcd0c61c9788c06e0d925f4d1e6a22
- F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
 -F src/tclsqlite.c 0bbb44543175ef2033d39780a233f98bf354eff9
++F src/tclsqlite.c b6a4f27d57e8f6dea3b2e41034b2dee68ea37fc4
+ F src/test1.c 093d8b5b54b829dcfebae3181d4406edcc935d90
+ F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
  F src/test5.c 5a34feec76d9b3a86aab30fd4f6cc9c48cbab4c1
@@@ -269,7 -253,7 +270,7 @@@ F src/test_autoext.c dea8a01a7153b9adc9
  F src/test_backup.c 3875e899222b651e18b662f86e0e50daa946344e
  F src/test_blob.c 1f2e3e25255b731c4fcf15ee7990d06347cb6c09
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
- F src/test_config.c d0d671ce14e41abd487036ef8c4422585157d49a
 -F src/test_config.c e7b2e1634324d746aa5e1c7e0929470e8be27953
++F src/test_config.c fc2616bded292c77e7c13e5aa62dd2732a613ba2
  F src/test_demovfs.c 69b2085076654ebc18014cbc6386f04409c959a9
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
@@@ -304,18 -288,18 +305,18 @@@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f
  F src/threads.c 2fb3ea4d70d5acf68b539c2489b4adace61cc01b
  F src/tokenize.c e00458c9938072b0ea711c850b8dcf4ddcb5fe18
  F src/trigger.c 25571661fdeae8c7f975ff40ffec205520a3f92f
 -F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13
 +F src/update.c d207deb7a031f698104bee879de0632b611e72dd
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
- F src/util.c 3b627daa45c7308c1e36e3dbaa3f9ce7e5c7fa73
+ F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e
  F src/vacuum.c 9b30ec729337dd012ed88d4c292922c8ef9cf00c
- F src/vdbe.c c02217423a807dc97c743f5fff493cd55dffa77d
 -F src/vdbe.c ddfc977981cd6324668aa6b114045eb1c677421a
 -F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
 -F src/vdbeInt.h 9bb69ff2447c34b6ccc58b34ec35b615f86ead78
 -F src/vdbeapi.c 4bc511a46b9839392ae0e90844a71dc96d9dbd71
 -F src/vdbeaux.c 07ef87c6d4b5abdf13ff33babb10205702fdab0a
 -F src/vdbeblob.c 4af4bfb71f6df7778397b4a0ebc1879793276778
 -F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
++F src/vdbe.c d18d7bbe5099b4ae7573673232eb29c12075f174
 +F src/vdbe.h b434bb75fbec973d18d49225a59833ae39ee2afc
 +F src/vdbeInt.h dc69f0351bef56456fdba3e09d3387ba4f1b1520
 +F src/vdbeapi.c 90aeb4b3f1dc86d6576a2ce2d5bad12761329bd5
 +F src/vdbeaux.c db4cf9f69c415318fbc19c2e0d2efd693fbe51af
 +F src/vdbeblob.c cb7359c2d99df92c35cdaedc12af6d4f83854cb7
 +F src/vdbemem.c 96e41193b4affd9ebc0eea2fa628879dac88c744
- F src/vdbesort.c 560bdfd9eb3ae3205196e0d64ccd1de925caa6c7
+ F src/vdbesort.c 6d64c5448b64851b99931ede980addc3af70d5e2
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
  F src/vtab.c c08ec66f45919eaa726bf88aa53eb08379d607f9
  F src/wal.c 85353539f2d9d0c91ebd057c32525b1e1aa3335e
@@@ -799,7 -783,7 +800,7 @@@ F test/pagesize.test 1dd51367e752e742f5
  F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
- F test/permutations.test eccbf3203f155846298ad5b1a7255c4dd49ac325
 -F test/permutations.test f9cc1dd987986c9d4949211c7a4ed55ec9aecba1
++F test/permutations.test e5e9f708879336e10095ded8d61966007f4a2c5c
  F test/pragma.test aa16dedfe01c02c8895169012f7dfde9c163f0d5
  F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
@@@ -1219,10 -1202,10 +1220,10 @@@ F tool/mkkeywordhash.c dfff09dbbfaf950e
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
  F tool/mkpragmatab.tcl 07a5124cf2dbafa1b375eefcf8ac4227028b0f8b
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
- F tool/mksqlite3c-noext.tcl 88a1e3b0c769773fb7a9ebb363ffc603a4ac21d8
- F tool/mksqlite3c.tcl da1b2f86cb5b3fb0200826137d5f480dc089c7ea
+ F tool/mksqlite3c-noext.tcl 9ef48e1748dce7b844f67e2450ff9dfeb0fb4ab5
 -F tool/mksqlite3c.tcl cfde806851c413db7689b9cb74a4eeb92539c601
 -F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12
++F tool/mksqlite3c.tcl d85bfc548f52fe4443e51355f5696f67f6d8236c
 +F tool/mksqlite3h.tcl 2d0f1b3768f8d000b7881217d5fd4c776eb27467
- F tool/mksqlite3internalh.tcl b6514145a7d5321b47e64e19b8116cc44f973eb1
+ F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl 52a4c613707ac34ae9c226e5ccc69cb948556105
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
  F tool/omittest.tcl 34d7ac01fe4fd18e3637f64abe12c40eca0f6b97
@@@ -1253,7 -1236,7 +1254,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 86e39123c1bca457672bc63eff00a823745077e5 50b5a8af843fff93452cd1c8f82152124a1d864a
- R 67779bbdb7710c0ef643df0ef1caefea
 -P 5682db7b871689b9ee764afe070736f378e8ae1b
 -R dfd426dd4e5c9bb35969866ff363968f
++P 5a2dec55bfadc328b430a5231a037b37831a5530 882181ff9dd75f32db266db6e476671021fc567b
++R e4745f2aa60be4c3617dfbe8a7fd6de6
  U drh
- Z d1795e9058f081650515c9a852afa236
 -Z bd5f3f08ebc84ee22d9c4c92ffb9e94c
++Z d901122b20adc39db7da73d5e36efc01

diff --cc manifest.uuid
index 59e1ebafa443af36e735f9b71710181355023ddd,4e9c91e56e442ffa4cf0ef354eeb49b0c59b9db3..f5113bc4a447ed557005e61317833560a57749ab
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5a2dec55bfadc328b430a5231a037b37831a5530
 -882181ff9dd75f32db266db6e476671021fc567b
++0ba124540b5b2a9ceda0f4f4a46e6be54edad813

diff --cc src/delete.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/shell.c
index 2bfecefe6bf44218072f2c7d311c3ceae05ef060,9c0481c0dd15b5c30f6e309bddcb647e22f83f6a..14c4b57ce25ddc5ec12491721b7ad5d5e66ecef4
--- 1/src/shell.c
--- 2/src/shell.c
+++ b/src/shell.c
@@@ -1737,11 -1763,8 +1780,11 @@@ static char zHelp[] 
    ".schema ?TABLE?        Show the CREATE statements\n"
    "                         If TABLE specified, only show tables matching\n"
    "                         LIKE pattern TABLE.\n"
-   ".separator STRING ?NL? Change separator used by output mode and .import\n"
-   "                         NL is the end-of-line mark for CSV\n"
+   ".separator COL ?ROW?   Change the column separator and optionally the row\n"
+   "                         separator for both the output mode and .import\n"
 +#if defined(SQLITE_ENABLE_SESSION)
 +  ".session CMD ...       Create or control sessions\n"
 +#endif
    ".shell CMD ARGS...     Run CMD ARGS... in a system shell\n"
    ".show                  Show the current values for various settings\n"
    ".stats on|off          Turn stats on or off\n"

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/tclsqlite.c
Simple merge

diff --cc src/test_config.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc test/permutations.test
Simple merge

diff --cc tool/mksqlite3c.tcl
Simple merge