Merge recent trunk enhancements.

FossilOrigin-Name: 6c3f09028f070b2612c00466ec3f01e2098b818d

diff --cc Makefile.msc
Simple merge

diff --cc ext/rtree/rtree.c
Simple merge

diff --cc manifest
index 5b259269f38c3fe6254962972f6df9e0e8b32f28,1e0244811195225761f1e1a54c8931d9105a91b6..ab5c0d8cd6c19b1261171149282b214bb6bda41e
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\sall\srecent\strunk\senhancements\sinto\sthe\sapple-osx\sbranch.
- D 2017-01-27T16:39:38.607
 -C In\sRTREE,\suse\san\ssqlite3_blob\sobject\srather\sthan\san\ssqlite3_stmt\sobject\nfor\sreading\scontent\sout\sof\sthe\s%_node\sshadow\stable.
 -D 2017-02-04T14:24:05.401
 -F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
++C Merge\srecent\strunk\senhancements.
++D 2017-02-04T15:29:05.790
 +F Makefile.in 3fc65e1d80b5937998f15f7e4c97ee6471e291a4
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 16477ab34568b4cfd8abac4b5840f3dfc7806aec
 -F Makefile.msc ba953c8921fc7e18333f61898007206de7e23964
++F Makefile.msc addccc6c5977519e9f1763e8923150932ad3ec24
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION cddd8d88dc8202afa0ebc96da61fc4acbd1e96a5
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -263,7 -264,7 +264,7 @@@ F ext/rbu/sqlite3rbu.c bb0de6cdbdb14a7d
  F ext/rbu/sqlite3rbu.h 6fb6294c34a9ca93b5894a33bca530c6f08decba
  F ext/rbu/test_rbu.c 5aa22616afac6f71ebd3d9bc9bf1006cfabcca88
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
- F ext/rtree/rtree.c 0f08a7e36539acfac8a374d1daa23ba62e1242b6
 -F ext/rtree/rtree.c 0c229d23ce7b9bc69365281689065f3cbbe4561e
++F ext/rtree/rtree.c f6aedbf77010aec17f8e50f46465046f6842571a
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
  F ext/rtree/rtree1.test 42dadfc7b44a436cd74a1bebc0b9b689e4eaf7ec
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@@ -336,7 -336,7 +339,7 @@@ F src/auth.c 930b376a9c56998557367e6f7f
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
- F src/btree.c a018a533bb691092144bb363f7079fd19a5a777a
 -F src/btree.c 9fe65ab418d99e80289f024016b5e5e74c3059dd
++F src/btree.c 05843aa2287d3246793cc09a32c3603566037f49
  F src/btree.h e6d352808956ec163a17f832193a3e198b3fb0ac
  F src/btreeInt.h 10c4b77c2fb399580babbcc7cf652ac10dba796e
  F src/build.c 9e799f1edd910dfa8a0bc29bd390d35d310596af
@@@ -355,10 -355,10 +358,10 @@@ F src/hash.c 63d0ee752a3b92d4695b2b1f52
  F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c 8183e1778ec42d26732bec8c98aeffa8af13038f
+ F src/insert.c 444354c23d4d140a57d6eb46f34e376a7f8f62e8
 -F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
 +F src/legacy.c b419b813f192eef79d73f968511d2ee129525e21
  F src/loadext.c a68d8d1d14cf7488bb29dc5311cb1ce9a4404258
 -F src/main.c e207b81542d13b9f13d61e78ca441f9781f055b0
 +F src/main.c 54068ad4462bb4b44f8308e0dc3d2bfda1f51af3
  F src/malloc.c fc1b9f445290f2145da48fc08730c26e6082b640
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -377,29 -377,28 +380,29 @@@ F src/os.c c03b50496df5815e8f6d45bae440
  F src/os.h 8e976e59eb4ca1c0fca6d35ee803e38951cb0343
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 -F src/os_unix.c 30e2c43e4955db990e5b5a81e901f8aa74cc8820
 -F src/os_win.c cf90abd4e50d9f56d2c20ce8e005aff55d7bd8e9
 +F src/os_unix.c 4a58dfdfda7e72aab0e393953890a9b6d40a7ff4
 +F src/os_win.c 4224bff1904dfdf3664680897e1b5077de1fd649
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 -F src/pager.c ff1232b3088a39806035ecfac4fffeb22717d80b
 -F src/pager.h f2a99646c5533ffe11afa43e9e0bea74054e4efa
 +F src/pager.c 8a4a3066cf9b06191b852dc0bdcb70a06de9c472
 +F src/pager.h 32adb801774046224e87829fa74ce16ce31a9087
- F src/parse.y 29153738a7322054359320eb00b5a4cd44389f20
+ F src/parse.y 591704fce84f814d9a3642774c1f011d38f4149c
  F src/pcache.c 51070ec9b8251bbf9c6ea3d35fd96a458752929e
  F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
 -F src/pcache1.c e3967219b2a92b9edcb9324a4ba75009090d3953
 -F src/pragma.c 7831956012f5d764761fbd023e59b0ffc08f5e8d
 +F src/pcache1.c 6d8c7bc6bbae077a0c76440cf32342a65dfeac75
- F src/pragma.c 74f24422fcac808e9026dcf7c36c70ff00d67497
++F src/pragma.c 26e6c5f11e87de33b6d1852be2b12471e0c32baa
  F src/pragma.h 61aa5389118594bebb28120a6720401aee34ce1a
 -F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a
 +F src/prepare.c 601681ecade57127ffbb5df1e096a30f29eff54c
  F src/printf.c ff10a9b9902cd2afe5f655f3013c6307d969b1fd
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c f9bc0de45a30a450da47b3766de00be89bf9be79
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c 3856db523b942062bca8722ba03b61c324ff94d6
+ F src/select.c d12f3539f80db38b09015561b569e0eb1c4b6c5f
  F src/shell.c a84e453c213f3e0d6935a582024da4e242f85a19
- F src/sqlite.h.in 30cc134c53356f8097edb7d9b030b55199601da9
 -F src/sqlite.h.in 751ff125eb159c8f92c182b8df980a5e4f50e966
++F src/sqlite.h.in 080c30ae3f98fc4859cfb125fbe8430ae86fe8f1
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
- F src/sqliteInt.h da2cbcedaef16e47cf19abdbefe878fb8fb696cf
 -F src/sqliteInt.h 3724c48e82605b471bbf7e41109b5850c6e89f31
++F src/sqliteInt.h feb051fda6402dbb28092d4d4f3f0dc4e50bea5b
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -461,12 -460,12 +464,12 @@@ F src/update.c 456d4a4656f8a03c2abc88a5
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c a88b0466fddf445ce752226d4698ca3faada620a
  F src/vacuum.c 33c174b28886b2faf26e503b5a49a1c01a9b1c16
- F src/vdbe.c 761edd8fd90526e1850dfacaef527e7ebd7208cb
 -F src/vdbe.c e7b1e860140f1d1803c6f4176b1e8f3801f3a290
++F src/vdbe.c 2830f9c234b2ec833b9cf284a07ea6979d0e1e93
  F src/vdbe.h 59998ffd71d7caa8886bc78dafaf8caeccd4c13c
- F src/vdbeInt.h 281cb70332dc8b593b8c7afe776f3a2ba7d4255e
- F src/vdbeapi.c 46cdfab63a43ae48977bfd4cdf471aba23a59aae
- F src/vdbeaux.c 57a43a29be82a4bf7cd2e9f949ecd71fc701af5f
- F src/vdbeblob.c 2b3d1ad915dbe5dc92c48759dc18fa8c697e78e5
+ F src/vdbeInt.h 4e4b15b2e1330e1636e4e01974eab2b0b985092f
 -F src/vdbeapi.c 3e4a8893feeb78620f4aac4ac5b85d92255b97e1
++F src/vdbeapi.c 56ef5bdfd94c73f0b29019e78cbf72ced9c35541
+ F src/vdbeaux.c b9a36e530e6525ca9d9a685bc7b1d01fa77b5cf8
+ F src/vdbeblob.c 359891617358deefc85bef7bcf787fa6b77facb9
  F src/vdbemem.c 3b5a9a5b375458d3e12a50ae1aaa41eeec2175fd
  F src/vdbesort.c eda25cb2d1727efca6f7862fea32b8aa33c0face
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
@@@ -477,9 -476,9 +480,9 @@@ F src/wal.h 1598818fe90532a622ecdec5baa
  F src/walker.c 91a6df7435827e41cff6bb7df50ea00934ee78b0
  F src/where.c bc71775e23d23334e8f449aa31012d692dc09cb2
  F src/whereInt.h 2bcc3d176e6091cb8f50a30b65c006e88a73614d
- F src/wherecode.c e04ac8f24c3ac8621df6c3be3ac8c7d4fa893745
+ F src/wherecode.c 99a8ced164c75edf41b3a865a75381c9adb38b28
  F src/whereexpr.c 35ad025389a632a3987a35617c878be3b3d70dc6
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1552,7 -1552,8 +1557,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P c59c8880238dffd7b8a6da789aa7112fef333bd6 d9752c8f7c55426fd7d2b877c5cc3784f93b5349
- R 971be8a3f21cff2b7f31043214b965c6
 -P 5706d4708a30eb54da0ecbb6eb02f54746c390d9 95ee745fceb4a48c683f34c404c380fe5e7d684a
 -R ad6ed02dcc60e4bca51c672c64ac9b20
 -T +closed 95ee745fceb4a48c683f34c404c380fe5e7d684a
++P 0e14fe1b986abf1449d727fbe04c6a939ed209a2 97ccf3e4de11ffea46993cb7fb7ab559b9810705
++R b5759eefd636bb3b436e5984cb592ce8
  U drh
- Z 64eb1fd6f8380515edffd6348d2b99c5
 -Z c59d505acee8b5f741c72c39e5c6cdac
++Z 01a7e171c20aabda2c860608e811721c

diff --cc manifest.uuid
index d6f81e07f76061fc984e944931d8bf990169e5bf,99286a49a0f00edf3c4b7e9dccc06c4d335dec7e..8c2ce8fdd9dbd0461a023678c648fc3cc91a6d7b
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0e14fe1b986abf1449d727fbe04c6a939ed209a2
 -97ccf3e4de11ffea46993cb7fb7ab559b9810705
++6c3f09028f070b2612c00466ec3f01e2098b818d

diff --cc src/btree.c
Simple merge

diff --cc src/pragma.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
index f221d50634462769108bc9cbb3c4199ccf71f20b,cb8a039abbafc01e9aaa6b59f39131d87cafff6a..efbc88a9dfe9adddffd059b95c0730823cc46ded
--- 1/src/vdbe.c
--- 2/src/vdbe.c
+++ b/src/vdbe.c
@@@ -595,10 -595,8 +595,9 @@@ int sqlite3VdbeExec
      ** sqlite3_column_text16() failed.  */
      goto no_mem;
    }
 -  assert( p->rc==SQLITE_OK || (p->rc&0xff)==SQLITE_BUSY );
 +  assert( p->rc==SQLITE_OK || (p->rc&0xff)==SQLITE_BUSY
 +            || (p->rc&0xFF)==SQLITE_LOCKED );
    assert( p->bIsReader || p->readOnly!=0 );
-   p->rc = SQLITE_OK;
    p->iCurrentTime = 0;
    assert( p->explain==0 );
    p->pResultSet = 0;

diff --cc src/vdbeapi.c
Simple merge