Merge recent changes from trunk.

FossilOrigin-Name: e3d9efa2770cd789ece3f4db4941b901c8b805ad

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 3e52376686297eb548d22a5dcd4950671144823b,f3a72f1e93bf390952dff2d26f22cead38c664dd..8c98a57c29acf329ea1c17940fdde2e5c90aa4fb
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\srecent\senhancements\sfrom\strunk.
- D 2016-09-07T18:20:09.118
- F Makefile.in b0c3cd9e30ffb18d6952dbf3c2ee5ae07c6216d4
 -C Fix\sa\sproblem\scausing\sincorrect\scode\sto\sbe\sgenerated\sfor\sIN\sconstraints\slike\s"a\sIN\s(1,\s2,\s3)"\swhere\scolumn\s"a"\sis\sa\srowid\scolumn\swith\san\sextra\sUNIQUE\sindex\screated\son\sit.\sTicket\s[0eab1ac759].
 -D 2016-09-16T16:30:57.249
 -F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
++C Merge\srecent\schanges\sfrom\strunk.
++D 2016-09-16T17:50:57.342
++F Makefile.in c9c70541089a9755069a9dad0b609cf14a382649
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 217d91300f01f948706d05d901a91940a0085567
 -F Makefile.msc e1aa788e84f926e42239ee167c53f785bedacacd
++F Makefile.msc c42e31c221bc01b22d4433bb43068ee79846207c
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 25e2e333adeff5965520bc8db999c658898c972d
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -313,7 -310,7 +313,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk af15e89c810547dc18d23020451e2d75effaf21c
 -F main.mk 06dc0b1a9c9e2d05c9275937dd5b894bfe7d17d8
++F main.mk b5332ec519585646b7a33c99d1768592776f9a3c
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -332,10 -329,10 +332,10 @@@ F src/auth.c 930b376a9c56998557367e6f7f
  F src/backup.c 92c2e3b5fcb47626413717138617f4d32f08aea4
  F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63
  F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
 -F src/btree.c 2551bd3ecb8b8988fb8b23aabadfb214dbc38e46
 +F src/btree.c 0a3308f223e400a4865ba611073888683fce4af6
- F src/btree.h 075c45707c0f8f8af118f739f36df8098a08b7da
+ F src/btree.h d05b2fcc290991a8a3d9ea1816ddd55a4359dcde
  F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
- F src/build.c c2ccfcdd99e18894a8750e215b8d9c5398a3c073
+ F src/build.c 7438b6dae3022818100a79ebbad707b5c65f9344
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c e77f3dc297b4b65c96da78b4ae4272fdfae863d7
@@@ -350,10 -347,11 +350,11 @@@ F src/global.c c45ea22aff29334f6a9ec549
  F src/hash.c 55b5fb474100cee0b901edaf203e26c970940f36
  F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
- F src/insert.c 3edb5a1bda44df13531fedfcde5fbcc2fc04c222
+ F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
+ F src/insert.c 427e96ff168b6b187a52c3d06b9f9e41f6ffb212
 -F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
 +F src/legacy.c b419b813f192eef79d73f968511d2ee129525e21
- F src/loadext.c dd7a2b77902cc66c22555aef02e1a682554b7aec
+ F src/loadext.c 5d6642d141c07d366e43d359e94ec9de47add41d
 -F src/main.c 9821bb4d2399bc5a0b8a5dfc06bede2d1520255c
 +F src/main.c 8525df779c1bbf6c0350d6971cd9b37a8c10ba3a
  F src/malloc.c 1443d1ad95d67c21d77af7ae3f44678252f0efec
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -372,36 -370,35 +373,36 @@@ 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 be9ca0f901a2b6c1bc93dc338f4863675180c189
 -F src/os_win.c 520f23475f1de530c435d30b67b7b15fe90874b0
 +F src/os_unix.c 5f558f9433256f25d2f2dd852c7e93a84c05e1e4
 +F src/os_win.c 8ba3403e276b0b01fd822bfcc162b83cacc80a1a
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 -F src/pager.c bf5b71bde3e9b6110e7d6990607db881f6a471a2
 -F src/pager.h 966d2769e76ae347c8a32c4165faf6e6cb64546d
 +F src/pager.c 06b9b230273dbbd700a6f2bfe39d51be4bb0da03
 +F src/pager.h 16644d79a66502f77389648ad5f2dca0ce0095de
- F src/parse.y ed6990c2d41eb0302eda90d5009c51fec792c850
+ F src/parse.y 0e0b6d46a990d01e4ca1e9d7e1d2d9b5a98f6bcb
  F src/pcache.c 5583c8ade4b05075a60ba953ef471d1c1a9c05df
  F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
 -F src/pcache1.c 4bb7a6a5300c67d0b033d25adb509c120c03e812
 -F src/pragma.c d932ba278654617cdd281f88a790a3185fca7c44
 +F src/pcache1.c 42fc9916238609e499c04e521138cecd42a20b90
 +F src/pragma.c 7a32fcc81f3c765621dba31a248dfbeb0342b569
  F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
 -F src/prepare.c 0fcf16eaacc90c1059055519a76b75b516a59a88
 +F src/prepare.c 9d96dd74aabcae932604807f178ccb5c420e160e
  F src/printf.c a5f0ca08ddede803c241266abb46356ec748ded1
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c d67b9a5cc33339256e2088c5a722745fc2ff5219
+ F src/resolve.c 3c3cf0dc719cd2a32ab5c1e10c26481dd565492e
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c fda7fd24b4d8e75479ae581329db0a0b0bf76633
- F src/shell.c de7c7e98846cacbfbe062cbd98bca899dfb720e3
- F src/sqlite.h.in bf745d785ea9d1ba3a89a71fc2b592727a400974
+ F src/select.c 244f9cc5e4662987cd2ef5c22d1b7027560f3425
+ F src/shell.c ae7058efb5084b4b9576dc5485bb3d2870b1974a
 -F src/sqlite.h.in 46ed821aeed0ba45559fb15597d9a400083154a2
++F src/sqlite.h.in e0462107113cb8333d9ffda8c4c00b8870d91462
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
- F src/sqliteInt.h ec1a08e3ebd7644a62237aafba28782fb14a41fb
 -F src/sqliteInt.h c9e010a79ab4ed7bdc910a24d8f08f3c6d5f822c
++F src/sqliteInt.h 8a856df8ece345509dcd94b5653bf114eabb5e57
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
- F src/tclsqlite.c bdae822f21e229b6daced15938b6343ce44ef454
- F src/test1.c 90a6f4aece9d71c73879c43d67baac2ddf2e8d4e
+ F src/tclsqlite.c aef87dcd8cb66564d560ab48d43d19ac812a1eab
 -F src/test1.c 61a08ed5861f3396ea4ff83931387696b692e1f8
++F src/test1.c 0463a5089398da31afa8520a6774f8d4ebdbcff3
  F src/test2.c b7174313e993754303a8b33c43df7c44b46857ab
- F src/test3.c 1339a40be39650ae83894b6578f971dc7f96ea8a
+ F src/test3.c d03f5b5da9a2410b7a91c64b0d3306ed28ab6fee
  F src/test4.c 18ec393bb4d0ad1de729f0b94da7267270f3d8e6
  F src/test5.c 328aae2c010c57a9829d255dc099d6899311672d
  F src/test6.c 55aa2775c154415dcf4ed7cd1e19a193122b3a02
@@@ -414,7 -411,8 +415,8 @@@ F src/test_backup.c bf5da90c9926df0a4b9
  F src/test_bestindex.c d23f80d334c59662af69191854c76b8d3d0c8c96
  F src/test_blob.c a0f7ad49a0c9d4b72f693fe2a71c58d7e507174d
  F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
 -F src/test_config.c 4d3d4a886416f369771d69a6dba926866deda788
 +F src/test_config.c e91bd1471a56cf0267fd934f13e916b788e5f7af
+ F src/test_delete.c f4920c10d7208ac55ee03882de9709cf39a83fec
  F src/test_demovfs.c a0c3bdd45ed044115c2c9f7779e56eafff18741e
  F src/test_devsym.c 4e58dec2602d8e139ca08659f62a62450587cb58
  F src/test_fs.c e16cbe68d3b107e00a907c20a9a02629870eb69b
@@@ -455,25 -453,25 +457,25 @@@ F src/update.c 8179e699dbd45b92934fd02d
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c 810ec3f22e2d1b62e66c30fe3621ebdedd23584d
  F src/vacuum.c 913970b9d86dd6c2b8063ef1af421880f1464ec3
- F src/vdbe.c 4581775c031f095a87752316a85de425ac8edf43
 -F src/vdbe.c 31a17090bf658c1e6ba4e58f7a08e8ce4c2e7d7f
++F src/vdbe.c 108964db8a690d3a4635daba25fe2742cb808e96
  F src/vdbe.h 67bc551f7faf04c33493892e4b378aada823ed10
  F src/vdbeInt.h c59381049af5c7751a83456c39b80d1a6fde1f9d
 -F src/vdbeapi.c a32d61b7dd05e6890d8fd44d2805f55e2f5ba9f3
 +F src/vdbeapi.c 17e7b6517d964149abc12dadcbea84a2b71a741b
- F src/vdbeaux.c 83458783d241cfd6691141c8a105832ee50258e5
+ F src/vdbeaux.c 12831f89de66a23d575d129dc1bda543a09a80c7
  F src/vdbeblob.c 3e82a797b60c3b9fed7b8de8c539ca7607874937
- F src/vdbemem.c 1ecaa5ee0caff07255f25d04e8dc88befb6f88d1
+ F src/vdbemem.c 357caac1a404f37ee6087b17613f92107c13f733
  F src/vdbesort.c 91fda3909326860382b0ca8aa251e609c6a9d62c
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
  F src/vtab.c e02cacb5c7ae742631edeb9ae9f53d399f093fd8
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 02eeecc265f6ffd0597378f5d8ae9070b62a406a
 -F src/wal.h 6dd221ed384afdc204bc61e25c23ef7fd5a511f2
 +F src/wal.c 25bc1cea2ab18a917548dd0a30c299c538878ef9
 +F src/wal.h f38853cd771ff42f448de4f908238f2e2966ac8f
  F src/walker.c 2d2cc7fb0f320f7f415215d7247f3c584141ac09
- F src/where.c 4bbc3f1dcda64c96ed5f0ffe51be7c0d7adb6c62
- F src/whereInt.h e5b939701a7ceffc5a3a8188a37f9746416ebcd0
- F src/wherecode.c 99707d11907c71d289ee9553d2d1a22f1fd8ba41
- F src/whereexpr.c 98ce9f3b8d92b6f741b9f3498f9619695739256e
+ F src/where.c d0ca1b5e1c56249e7725cea66ce4e172c5845dec
+ F src/whereInt.h 14dd243e13b81cbb0a66063d38b70f93a7d6e613
+ F src/wherecode.c e412e09abad1eea213d85594cf46db9f877db56d
+ F src/whereexpr.c e3db778ed205e982f31960896db71c50612ae009
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7
@@@ -832,10 -831,10 +835,10 @@@ F test/in.test 20c5529986998949908f889c
  F test/in2.test 5d4c61d17493c832f7d2d32bef785119e87bde75
  F test/in3.test 3cbf58c87f4052cee3a58b37b6389777505aa0c0
  F test/in4.test d2b38cba404bc4320f4fe1b595b3d163f212c068
- F test/in5.test acc710c12af118df5f8645eaba9479f5619eed81
+ F test/in5.test 6c006e0bcd7351b69350ef566e65f244023489e9
  F test/incrblob.test c9b96afc292aeff43d6687bcb09b0280aa599822
  F test/incrblob2.test a5ce5ed1d0b01e2ed347245a21170372528af0a5
 -F test/incrblob3.test d8d036fde015d4a159cd3cbae9d29003b37227a4
 +F test/incrblob3.test 5fa6f2665ae37da05928bb16851d4f86515af78a
  F test/incrblob4.test f26502a5697893e5acea268c910f16478c2f0fab
  F test/incrblob_err.test 69f9247fed50278d48ea710d1a8f9cdb09e4c0b8
  F test/incrblobfault.test 280474078f6da9e732cd2a215d3d854969014b6e
@@@ -1022,9 -1020,19 +1025,19 @@@ F test/resolver01.test f4022acafda7f4d4
  F test/rollback.test 458fe73eb3ffdfdf9f6ba3e9b7350a6220414dea
  F test/rollback2.test 8435d6ff0f13f51d2a4181c232e706005fa90fc5
  F test/rollbackfault.test 0e646aeab8840c399cfbfa43daab46fd609cf04a
 -F test/rowallock.test 3f88ec6819489d0b2341c7a7528ae17c053ab7cc
 +F test/rowallock.test e8c576ebc92f6b9211662f495658fd39bbcacb5b
  F test/rowhash.test 0bc1d31415e4575d10cacf31e1a66b5cc0f8be81
  F test/rowid.test 5b7509f384f4f6fae1af3c8c104c8ca299fea18d
+ F test/rowvalue.test 753eb744b7efeb5ac643d35d6e1e5066452ccf79
+ F test/rowvalue2.test 060d238b7e5639a7c5630cb5e63e311b44efef2b
+ F test/rowvalue3.test 01399b7bf150b0d41abce76c18072da777c2500c
+ F test/rowvalue4.test 4b556d7de161a0dd8cff095c336e913986398bea
+ F test/rowvalue5.test c81c7d8cf36711ab37675ad7376084ae2a359cb6
+ F test/rowvalue6.test d19b54feb604d5601f8614b15e214e0774c01087
+ F test/rowvalue7.test 5d06ff19d9e6969e574a2e662a531dd0c67801a8
+ F test/rowvalue8.test 5900eddad9e2c3c2e26f1a95f74aafc1232ee5e0
+ F test/rowvalue9.test e24f9eb02baffc6a67b6eed9e40d4c612c98079d
+ F test/rowvaluefault.test 7b16485e3f2b371f3e3d05455b8ded6d0c090244
  F test/rtree.test 0c8d9dd458d6824e59683c19ab2ffa9ef946f798
  F test/run-wordcount.sh 891e89c4c2d16e629cd45951d4ed899ad12afc09
  F test/savepoint.test c671fdbd34cd3bfe1518a777526ada595180cf8d
@@@ -1113,13 -1121,13 +1126,13 @@@ F test/sqllimits1.test a74ee2a3740b9f9c
  F test/sqllog.test 6af6cb0b09f4e44e1917e06ce85be7670302517a
  F test/stat.test f8f1279ffffabe6df825723af18cc6e0ae70a893
  F test/statfault.test f525a7bf633e50afd027700e9a486090684b1ac1
 -F test/stmt.test 64844332db69cf1a735fcb3e11548557fc95392f
 +F test/stmt.test fc832e52bd1273144abbb27c07fc01d1acdd9939
  F test/subquery.test d7268d193dd33d5505df965399d3a594e76ae13f
  F test/subquery2.test 438f8a7da1457277b22e4176510f7659b286995f
- F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
+ F test/subselect.test 0966aa8e720224dbd6a5e769a3ec2a723e332303
  F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a
  F test/subtype1.test 7fe09496352f97053af1437150751be2d0a0cae8
 -F test/superlock.test ec94f0556b6488d97f71c79f9061ae08d9ab8f12
 +F test/superlock.test c86eacd6cead5da9c5ecd25f3d46fca30a927ef2
  F test/symlink.test c9ebe7330d228249e447038276bfc8a7b22f4849
  F test/sync.test 2f84bdbc2b2df1fcb0220575b4b9f8cea94b7529
  F test/syscall.test f59ba4e25f7ba4a4c031026cc2ef8b6e4b4c639c
@@@ -1136,7 -1144,7 +1149,7 @@@ F test/temptable.test d2c9b87a54147161b
  F test/temptable2.test cd396beb41117a5302fff61767c35fa4270a0d5e
  F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
  F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
- F test/tester.tcl 92af6adf39ff36788a29e60c566488e555c1b7aa
 -F test/tester.tcl 4ce5afd5e192db4cae178e1a983b060e0f08c5d6
++F test/tester.tcl face9fe494368cde6caa5f3017b238f1adf6d6c3
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1517,7 -1525,7 +1530,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 c3cd543f3380475509d7bab9bb6c7858a8402457 12b7782a9af91eab913e159149cb28b3f5a6557c
- R 3e75819e222efa28e21cfe9d58920b01
 -P a49bc0a8244feb08b83e716d81c2a9512c184539
 -R 6f0469103fd0ee7eefefaa24af917500
 -U dan
 -Z 752f0595c26528c23b738c8e2fc1f9ad
++P 00759af053e0ea9bd73dba2cf6cad83598ea393b a92aee5520cfaf85ae896365a7e42bdd981f828d
++R aefb160798c8094f09768853fde42ea3
 +U drh
- Z 2580f9d8aa04fecaed6d9ec9d8dd285e
++Z 6cfd68a87e88d588fc1f4e0c7b3676e7

diff --cc manifest.uuid
index 2bc31678547a8301f8fb5b559c21d3f2d0163ee5,6a719c5d9c2f21ad94b7d9e88d6e5ebaad47032f..a2f1a65988bbd146e98934075e95a6a4448e8c5c
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 00759af053e0ea9bd73dba2cf6cad83598ea393b
 -a92aee5520cfaf85ae896365a7e42bdd981f828d
++e3d9efa2770cd789ece3f4db4941b901c8b805ad

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc test/tester.tcl
Simple merge