Merge updates from trunk.

FossilOrigin-Name: 566b551e5a81440a5c8ff865ceb4422c76d67cf7

diff --cc manifest
index 6f70025bc8e1f7f76fb990e4253f928ec02fee82,d573902ae9daeb4cadbd3178eec36c2d1bfdec59..9b4d901476bc2ec3e70094eed65c639eec0dcc27
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,19 -1,20 +1,20 @@@
 -C Preupdate\shook\sdocumentation\sfixes.\s\sNo\schanges\sto\scode.
 -D 2016-04-01T17:54:07.826
 +C Merge\supdates\sfrom\strunk.
- D 2016-01-06T20:50:02.942
- F Makefile.in 7c8cc4c2f0179efc6fa9492141d1fb65f4807054
++D 2016-04-03T20:45:04.922
+ F Makefile.in e812bb732d7af01baa09f1278bd4f4a2e3a09449
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc e45d8b9b56dfa3f2cd860b2c28bd9d304513b042
+ F Makefile.msc fe57d7e3e74fa383fd01ced796c0ffd966fc094a
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
- F VERSION 8b9d3ac6f1962f94e06ba05462422a544f9c4e36
+ F VERSION 5d234da9b5dae329fab75ff75884cfe0a9cb3fda
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
  F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
  F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
- F autoconf/Makefile.am 089e5ecdb5761e64ea1013ded02feb4d8b29927d
- F autoconf/README 14458f1046c118efa721aadec5f227e876d3cd38
+ F autoconf/Makefile.am 42f7eb1fb2b06ddd6c6adab3e4388cc0a237ba40
+ F autoconf/Makefile.msc dc0d0500e4a827cb3891d08d846dd6dd40241b51
  F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
- F autoconf/configure.ac 82c628c68f0f204d57343dc345b6dbd1789fb1bd
 -F autoconf/README.txt 4f04b0819303aabaa35fff5f7b257fb0c1ef95f1
++F autoconf/README.txt 4f04b0819303aabaa35fff5f7b257fb0c1ef95f1 w autoconf/README
+ F autoconf/configure.ac d807b567f73a2b0986ccdd206b782cecb4d08fff
  F autoconf/tea/Makefile.in b438a7020446c8a8156e8d97c8914a04833da6fd
  F autoconf/tea/README 3e9a3c060f29a44344ab50aec506f4db903fb873
  F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43
@@@ -313,37 -353,37 +353,37 @@@ F src/mutex_noop.c 9d4309c075ba9cc7249e
  F src/mutex_unix.c 27bb6cc49485ee46711a6580ab7b3f1402211d23
  F src/mutex_w32.c 5e6fe1c298fb5a8a15aaed4161d5759311431c17
  F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
- F src/os.c 8fd25588eeba74068d41102d26810e216999b6c8
- F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
- F src/os_common.h abdb9a191a367793268fe553d25bab894e986a0e
+ F src/os.c ca10edb445ad2c5fdc7285b49d72bcdf261fa23e
+ F src/os.h 91ff889115ecd01f436d3611f7f5ea4dc12d92f1
+ F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c 0ca6d8710366fbb01a275160f018334cd347cbda
- F src/os_win.c 386fba30419e8458b13209781c2af5590eab2811
+ F src/os_unix.c b1ccb273771f41dbdbe0ba7c1ad63c38ad5972ec
+ F src/os_win.c ff870d89f4cb088a04cbf5ea0cbd9ff1b089ff4a
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
- F src/pager.c 58d2593612acb6b542de6715b4af397ea1fa0a35
- F src/pager.h bf25005b4656cd805af43487c3139fca9678d0cc
- F src/parse.y 23737e649c26ce327603799e57f5c2ff50e5e6ba
- F src/pcache.c 73895411fa6b7bd6f0091212feabbe833b358d23
- F src/pcache.h 1ff11adce609ba7de139b6abfabaf9a2bac947b5
- F src/pcache1.c 72f644dc9e1468c72922eff5904048427b817051
- F src/pragma.c f3e7147299ca05ef4304a36f1fd6e002729c72c6
+ F src/pager.c 38718a019ca762ba4f6795425d5a54db70d1790d
+ F src/pager.h e1d38a2f14849e219df0f91f8323504d134c8a56
+ F src/parse.y 5ea8c81c5c41b27887f41b4a7e1c58470d7d3821
+ F src/pcache.c 647bb53a86b7bbcf55ad88089b3ea5a9170b90df
+ F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
+ F src/pcache1.c c40cdb93586e21b5dd826b5e671240bd91c26b05
+ F src/pragma.c faf42922bb7ab2f6672cb550356c1967abae3c84
  F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
- F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
- F src/printf.c af589a27b7d40f6f4f704e9eea99f02f18ad6d32
+ F src/prepare.c 22df6171aec1d86904ed2ad30c2348a5748aa04e
+ F src/printf.c 63e6fb12bbe702dd664dc3703776c090383a5a26
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c a83b41104e6ff69855d03cd0aaa09e93927ec39f
- F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c f8fded11fc443a9f5a73cc5db069d06b34460e2f
- F src/shell.c 3ecb7a857c4595fef9ae4141fc8bb8dc53021be2
- F src/sqlite.h.in 7d87d71b9a4689c51fa092f48f16590ff71558e3
- F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
- F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h f97614d43833bae0ed6c51ac8e550f0099a1d0ba
- F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
+ F src/resolve.c b8f7174e5f8c33c44ded3a25a973d0bb89228c20
+ F src/rowset.c 9fe4b3ad7cc00944386bb600233d8f523de07a6e
+ F src/select.c 7849cee0a01952a9c93cd28989daedfa57731143
 -F src/shell.c cd3f82fdc5c895b817a375b7ab8319cb41f447ce
++F src/shell.c c8a75d0d77c3fe691e0f5f970ddc5e49908ebe97
+ F src/sqlite.h.in c46a7b85d3f37371cacea8f98ec825f5e52c420c
+ F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
+ F src/sqlite3ext.h 98f72cbfe00169c39089115427d06ea05fe4b4a2
+ F src/sqliteInt.h 594bf31a7a0cc788688ca947e562576e23bd7904
+ F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
- F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
- F src/tclsqlite.c d9439b6a910985b7fff43ba6756bcef00de22649
- F src/test1.c 4f1b42699068b7806af3111786f5ad760c2c1ff7
+ F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
+ F src/tclsqlite.c 56569acc73d36e836b64aefecbbb709a92ba0077
+ F src/test1.c 7187b7e924bfc97780e6fd2a40dad94a32bddca0
  F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
  F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -964,6 -1010,7 +1010,7 @@@ F test/savepoint4.test c8f8159ade6d2acd
  F test/savepoint5.test 0735db177e0ebbaedc39812c8d065075d563c4fd
  F test/savepoint6.test f41279c5e137139fa5c21485773332c7adb98cd7
  F test/savepoint7.test db3db281486c925095f305aad09fe806e5188ff3
 -F test/savepointfault.test f044eac64b59f09746c7020ee261734de82bf9b2
++F test/savepointfault.test f044eac64b59f09746c7020ee261734de82bf9b2 w test/savepoint3.test
  F test/scanstatus.test 5253c219e331318a437f436268e0e82345700285
  F test/schema.test 8f7999be894260f151adf15c2c7540f1c6d6a481
  F test/schema2.test 906408621ea881fdb496d878b1822572a34e32c5
@@@ -1324,9 -1373,10 +1373,10 @@@ F test/whereE.test b3a055eef928c992b0a3
  F test/whereF.test 5b2ba0dbe8074aa13e416b37c753991f0a2492d7
  F test/whereG.test dde4c52a97385a55be6a7cd46be8373f0cf35501
  F test/whereH.test e4b07f7a3c2f5d31195cd33710054c78667573b2
- F test/whereI.test 1d89199697919d4930be05a71e7fe620f114e622
+ F test/whereI.test eab5b226bbc344ac70d7dc09b963a064860ae6d7
  F test/whereJ.test 55a3221706a7ab706293f17cc8f96da563bf0767
  F test/whereK.test f8e3cf26a8513ecc7f514f54df9f0572c046c42b
 -F test/wherefault.test 1374c3aa198388925246475f84ad4cd5f9528864
++F test/wherefault.test 1374c3aa198388925246475f84ad4cd5f9528864 w test/where8m.test
  F test/wherelimit.test 5e9fd41e79bb2b2d588ed999d641d9c965619b31
  F test/wild001.test bca33f499866f04c24510d74baf1e578d4e44b1c
  F test/win32heap.test ea19770974795cff26e11575e12d422dbd16893c
@@@ -1404,9 -1457,30 +1457,30 @@@ F tool/varint.c 5d94cb5003db9dbbcbcc5df
  F tool/vdbe-compress.tcl 5926c71f9c12d2ab73ef35c29376e756eb68361c
  F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
- F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
+ F tool/warnings.sh a98af506df552f3b3c0d904f94e4cdc4e1a6d598
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 54c5522dda239cb9775709495ed7eb56a5dd8e11 55a11fd627eaf046b3783622b2925399a50a65b4
- R 46885463c2d1961463db4e0c7cb78c41
+ F vsixtest/App.xaml b76d3b48860e7454775c47ea38ffea9c4abe3e85
+ F vsixtest/App.xaml.cpp c465147f50871165c60ca16955219f6c5812d6d8
+ F vsixtest/App.xaml.h 4a9768e2983d05600ad1e1c2f1b00a132967da9f
+ F vsixtest/Assets/LockScreenLogo.scale-200.png e820c9a3deb909197081b0bf3216c06e13905f0a
+ F vsixtest/Assets/SplashScreen.scale-200.png cab70988ca71bebec7bfeb3b6dbafe17b9ab0b4a
+ F vsixtest/Assets/Square150x150Logo.scale-200.png e17b40817db7a239fc239d83efcc951fb824e3ff
+ F vsixtest/Assets/Square44x44Logo.scale-200.png 2f166237094dea94d952d10b9eeae81806844f1c
+ F vsixtest/Assets/Square44x44Logo.targetsize-24_altform-unplated.png 5f6a6d391b95a3061ccca6e6fdd6955ede63b4ed
+ F vsixtest/Assets/StoreLogo.png 0828b7257db74a4ecd5eeb6b7b4971f0fdc4d9d1
+ F vsixtest/Assets/Wide310x150Logo.scale-200.png 04ddefe5bc5f43ae12a7433f6f236ddab101ac42
+ F vsixtest/MainPage.xaml 34f49897e3ca533a7e74506ba0759b66eebce151
+ F vsixtest/MainPage.xaml.cpp 7f31fc6de751b64676c0924c97a5485d950a91d7
+ F vsixtest/MainPage.xaml.h cc05cca10d50a003f6c6e4448b701cdd07f52f29
+ F vsixtest/Package.appxmanifest 6b6db1eb7df3a315c5d681059754d5f0e0c47a93
+ F vsixtest/pch.cpp cb823cfac36f1a39a7eb0acbd7e9a0b0de8f23af
+ F vsixtest/pch.h 9cab7980f2ac4baa40807d8b5e52af32a21cf78c
+ F vsixtest/vsixtest.sln 77cadbe4e96c1fe1bf51cd77de9e9b0a12ada547
+ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
+ F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
+ F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
+ F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
 -P a62340dc0507e36f6dec05b1fda68d8399ec62ec
 -R 17cbd88111da841c5ced2fa2ee956e9f
 -U drh
 -Z dfefbe59c009b860b7f7e89f1f29dda4
++P 5cbab63756f6f276996f39d16d70b178581f63cd 59814f35d13db1f6379b9ae218b5432bc03c6197
++R 7b729d340f074699d469d04257844002
 +U mistachkin
- Z ce7926bdc7f3770ecae13f71c2dc0750
++Z ad64521de5ede9ab99c45ca3b47e617d

diff --cc manifest.uuid
index 3248019278967eb6352bb143d85cfc22b728cb07,c6941183070d156f3db69e5cfbee2e1fd8d0084d..3b86cc6a518ef4283daa3600cc6acd7cff5e0ecf
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5cbab63756f6f276996f39d16d70b178581f63cd
 -59814f35d13db1f6379b9ae218b5432bc03c6197
++566b551e5a81440a5c8ff865ceb4422c76d67cf7

diff --cc src/shell.c
index 47c1b07759b24d0a6b3a83a4b03ceaf038b5043f,2ce2f292dc3104ae8925cf0e20d3ad4cfb6943b7..925de30c4fd269ec28a011a5b14befdc58a2b228
--- 1/src/shell.c
--- 2/src/shell.c
+++ b/src/shell.c
@@@ -572,6 -539,52 +572,19 @@@ static char *one_input_line(FILE *in, c
    return zResult;
  }
  
 -/*
 -** Render output like fprintf().  Except, if the output is going to the
 -** console and if this is running on a Windows machine, translate the
 -** output from UTF-8 into MBCS.
 -*/
 -#if defined(_WIN32) || defined(WIN32)
 -void utf8_printf(FILE *out, const char *zFormat, ...){
 -  va_list ap;
 -  va_start(ap, zFormat);
 -  if( stdout_is_console && (out==stdout || out==stderr) ){
 -    extern char *sqlite3_win32_utf8_to_mbcs(const char*);
 -    char *z1 = sqlite3_vmprintf(zFormat, ap);
 -    char *z2 = sqlite3_win32_utf8_to_mbcs(z1);
 -    sqlite3_free(z1);
 -    fputs(z2, out);
 -    sqlite3_free(z2);
 -  }else{
 -    vfprintf(out, zFormat, ap);
 -  }
 -  va_end(ap);
 -}
 -#elif !defined(utf8_printf)
 -# define utf8_printf fprintf
 -#endif
 -
 -/*
 -** Render output like fprintf().  This should not be used on anything that
 -** includes string formatting (e.g. "%s").
 -*/
 -#if !defined(raw_printf)
 -# define raw_printf fprintf
 -#endif
 -
+ #if defined(SQLITE_ENABLE_SESSION)
+ /*
+ ** State information for a single open session
+ */
+ typedef struct OpenSession OpenSession;
+ struct OpenSession {
+   char *zName;             /* Symbolic name for this session */
+   int nFilter;             /* Number of xFilter rejection GLOB patterns */
+   char **azFilter;         /* Array of xFilter rejection GLOB patterns */
+   sqlite3_session *p;      /* The open session */
+ };
+ #endif
+ 
  /*
  ** Shell output mode information from before ".explain on", 
  ** saved so that it can be restored by ".explain off"