Merge recent enhancements from trunk.

FossilOrigin-Name: aafe1fec803ddf207bbcb3c669da0a9639411375fc04a52066dde4eb99c3c11b

diff --cc manifest
index a85bd5c4b66fecf61b2c8846b7fec556f60edf51,1573eb1f041cedb7fbdfed45e5bc10beb93b8558..9f0b60a3820a164a7c2222dfa0f799e9cb673517
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Minor\sfix\sto\sthe\sconcurrent.test\smodule\sso\sthat\sit\sworks\son\swindows.
- D 2017-07-20T19:28:49.858
 -C Allow\sATTACH\sand\sDETACH\sinside\sof\sa\stransaction.
 -D 2017-08-01T00:20:34.182
++C Merge\srecent\senhancements\sfrom\strunk.
++D 2017-08-01T13:54:55.914
  F Makefile.in d9873c9925917cca9990ee24be17eb9613a668012c85a343aef7e5536ae266e8
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 02b469e9dcd5b7ee63fc1fb05babc174260ee4cfa4e0ef2e48c3c6801567a016
@@@ -392,18 -388,18 +392,18 @@@ F spec.template 86a4a43b99ebb3e75e6b9a7
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
  F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
- F src/alter.c 850ede4e607f12fa25ea4f3cb6ece2b2e29d1aa50e3f786ce49d615788849552
+ F src/alter.c cf7a8af45cb0ace672f47a1b29ab24092a9e8cd8d945a9974e3b5d925f548594
  F src/analyze.c 0d0ccf7520a201d8747ea2f02c92c26e26f801bc161f714f27b9f7630dde0421
- F src/attach.c 3bd555e28382603e80d430dfebb2270f86e1e375b4c4be3e1ab1aec3a0c44943
+ F src/attach.c 07b706e336fd3cedbd855e1f8266d10e82fecae07daf86717b5760cd7784c584
  F src/auth.c 79f96c6f33bf0e5da8d1c282cee5ebb1852bb8a6ccca3e485d7c459b035d9c3c
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
 -F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 +F src/bitvec.c c77b7f5759e413c1c8b53267d633c952e66db79c1171964c7e24c0f92f5019cf
  F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
 -F src/btree.c f55ea8f456d103328d61076be40fa39acbfea05eaa4eccfed275532a63c867c4
 -F src/btree.h 3edc5329bc59534d2d15b4f069a9f54b779a7e51289e98fa481ae3c0e526a5ca
 -F src/btreeInt.h 97700795edf8a43245720414798b7b29d8e465aef46bf301ffacd431910c0da1
 -F src/build.c f65f86520aa877853125565e42c59c5c49851a4733392931777fb1aace4aedfd
 +F src/btree.c a21ffc82236d6108633559c9459d67b0e173e82934d417ad2ae998511ede6b55
 +F src/btree.h e8045998d865a21de226a417467cc64cf9d66e41b91b7436539f99ee464b5402
 +F src/btreeInt.h 4a4cc19595e98c471c05cd9d7fc824da3397c303c7293019f4df7706caacf2fe
- F src/build.c 62faff0876fdce2b18f14312e3e891f3f366ee493c8fb48d844f9cbae15e6a02
- F src/callback.c 8e14b60d1ed1c87c02cb5f121ecda99224f2aea6524a77ee6f72c9b5c7110f84
++F src/build.c f193b9b9b873780dd5a5fb6b4f2e4173dbd738655c5f683dca82963e8bb1f7fe
+ F src/callback.c 930648a084a3adc741c6471adfbdc50ba47ba3542421cb80a26f259f467de65e
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 928954802b1397d9fb1378c7eb702c94b4735bbab1d5793e21b6a77734f56a1b
  F src/date.c 48f743d88bbe88f848532d333cca84f26e52a4f217e86f86be7fc1b919c33d74
@@@ -418,10 -414,10 +418,10 @@@ F src/hash.c a12580e143f10301ed5166ea49
  F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c 487d2c1cd8d549f8d9492377ecc4d2f507b1bd5185e96c54389f6b607dce854c
+ F src/insert.c b88a58ff7eb99365b3ff163a5771c7e5db09f43997a8c5303588056ab33bc4eb
  F src/legacy.c 134ab3e3fae00a0f67a5187981d6935b24b337bcf0f4b3e5c9fa5763da95bf4e
  F src/loadext.c 20865b183bb8a3723d59cf1efffc3c50217eb452c1021d077b908c94da26b0b2
- F src/main.c 562527c0e4d67f890f64bb0eccb832a57505a8621f6336a9bcd7f96b91f94d09
 -F src/main.c 42f6a2660c7a1d643cc7e863d2dcd630c6aa1e8343f5478b0592120ab84c97ba
++F src/main.c 299da61b7ee007e04ed69873b1b750eed6b7a8463d601dd098c99d39b967e2be
  F src/malloc.c e20bb2b48abec52d3faf01cce12e8b4f95973755fafec98d45162dfdab111978
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -456,18 -452,18 +456,18 @@@ F src/printf.c 8757834f1b54dae512fb25eb
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c 4324a94573b1e29286f8121e4881db59eaedc014afeb274c8d3e07ed282e0e20
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c c6bf96a7f9d7d68f929de84738c599a30d0a725ab0b54420e70545743cd5ee7b
+ F src/select.c 31b35ddf55f1021f7148a01306984b057c11ebb6e3463d94677225e0a1e301a3
  F src/shell.c bd6a37cbe8bf64ef6a6a74fdc50f067d3148149b4ce2b4d03154663e66ded55f
  F src/shell.c.in b5725acacba95ccefa57b6d068f710e29ba8239c3aa704628a1902a1f729c175
- F src/sqlite.h.in 7a0789ad7159a2c7995eef91c246e164aeb3aef8622bf66dacfe7dfd180cc0cb
 -F src/sqlite.h.in 0e2603c23f0747c5660669f946e231730af000c76d1653b153dcf2c26fce0a6b
++F src/sqlite.h.in 967e269f5ae870aad10b04276437c19e833309f3acd252a585e1586b12031f45
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h 967154985ed2ae62f90d9029bb5b5071793d847f1696a2ebe9e8cc0b042ae60b
- F src/sqliteInt.h 6536c0b96e78986ab148723d7f2acb3749bbf1b26df8fd829821fe93ccd984bd
+ F src/sqlite3ext.h 0f9f72b86a3792314f5db7a1dfbc2c82376bcd8d0919ceb80637bca126ec3c68
 -F src/sqliteInt.h a1b8df420e8fa80fda9414ab7784d6e62271e1f7d65034ffd3e906ee6f014def
++F src/sqliteInt.h 513bd573821180f22a3af29951cc0bbe0fa2b58b9861d56054c54bfb06465606
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
- F src/tclsqlite.c 2c29b0b76e91edfd1b43bf135c32c8674710089197327682b6b7e6af88062c3d
+ F src/tclsqlite.c 487951d81f9704800fd9f0ffdaa2f935a83ccb6be3575c2c4ef83e4789b4c828
 -F src/test1.c cfb78b728b37ae3a2b14fe1b3a6c766e0da41370eda112594e698c94011b622e
 +F src/test1.c fa5a14d0a2576d38435c791ead17e7c3c1734bc10d231a8623cd6802b260f8ee
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c b8434949dfb8aff8dfa082c8b592109e77844c2135ed3c492113839b6956255b
  F src/test4.c 18ec393bb4d0ad1de729f0b94da7267270f3d8e6
@@@ -480,9 -476,9 +480,9 @@@ F src/test_async.c 195ab49da082053fdb0f
  F src/test_autoext.c 915d245e736652a219a907909bb6710f0d587871
  F src/test_backup.c bf5da90c9926df0a4b941f2d92825a01bbe090a0
  F src/test_bestindex.c d23f80d334c59662af69191854c76b8d3d0c8c96
- F src/test_blob.c f65ac717da2618691cf9dad094e6da0219dcd208
+ F src/test_blob.c ae4a0620b478548afb67963095a7417cd06a4ec0a56adb453542203bfdcb31ce
  F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
 -F src/test_config.c abf6fc1fe9d041b699578c42e3db81f8831c4f5b804f1927958102ee8f2b773e
 +F src/test_config.c 2b795b99d13060aae571b7a4c2732eee1c9f0d3431974b8c05d6a40342599411
  F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f
  F src/test_demovfs.c a0c3bdd45ed044115c2c9f7779e56eafff18741e
  F src/test_devsym.c 4e58dec2602d8e139ca08659f62a62450587cb58
@@@ -523,14 -519,14 +523,14 @@@ F src/trigger.c 48e0f7ed6749ce4d50a695e
  F src/update.c c443935c652af9365e033f756550b5032d02e1b06eb2cb890ed7511ae0c051dc
  F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
  F src/util.c fc081ec6f63448dcd80d3dfad35baecfa104823254a815b081a4d9fe76e1db23
- F src/vacuum.c ab48f1d3aa9483c02e7d518ec5d438432eb441f1d3b9fce726c64ac45a155afe
- F src/vdbe.c 1fd60b07bf2036970504f27a48f46159653e93798f2c29b1d28f95eeb0119c4e
 -F src/vacuum.c 90839322fd5f00df9617eb21b68beda9b6e2a2937576b0d65985e4aeb1c53739
 -F src/vdbe.c ac9cc205741b295d5b77917cfd2a45632de3cd5563e143e74dce1ede42e4b68c
++F src/vacuum.c 07eec96f821c7dcbdca2fadffc6e38ea2c24bf409fcb15fe9fb3ac444d632dfe
++F src/vdbe.c 6dd23d2ca92fa1a6d49e5a3afcf396bd1b138e2f19f96e762982fbceceeaef24
  F src/vdbe.h d50cadf12bcf9fb99117ef392ce1ea283aa429270481426b6e8b0280c101fd97
- F src/vdbeInt.h 19bd04a4211fe56c712ab35b48be77fd5a0579b851e9dea2cb8deade359b72b9
- F src/vdbeapi.c 52844a5a71712197be45f1c63d730c48a745c7457c959465cfb2b969af40a266
- F src/vdbeaux.c ca3e9b2391a78b7259d633033cc10045cec53f536ad7e5d6549b662b46246e32
+ F src/vdbeInt.h ff2b7db0968d20e6184aee256d2e535d565f5a172e3588a78adb166a41fc4911
+ F src/vdbeapi.c 0823531191f9d5588a245ed5b39306798681814e9e8099d54a3213a13a28fbe7
 -F src/vdbeaux.c 3fe68bad02b33b09e08bdc0ad90d6b92b3d571f7864c3d047abca1bde050751c
++F src/vdbeaux.c 849ecc41dadfc9e1c55929e4c2e3699d0937edd0e9a13fb923b5608eacca43e5
  F src/vdbeblob.c 359891617358deefc85bef7bcf787fa6b77facb9
- F src/vdbemem.c fe8fce1cdc258320b465934039fe4b1230d63f81d6b81b1eac775b6eec00af0d
+ F src/vdbemem.c 9ca2854976f35db40341977e688a08204c96427505f5b90215dc7970f6ea42c4
  F src/vdbesort.c f512c68d0bf7e0105316a5594c4329358c8ee9cae3b25138df041d97516c0372
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
  F src/vtab.c 35b9bdc2b41de32a417141d12097bcc4e29a77ed7cdb8f836d1d2305d946b61b
@@@ -657,13 -652,7 +657,13 @@@ F test/collate9.test 3adcc799229545940d
  F test/collateA.test b8218ab90d1fa5c59dcf156efabb1b2599c580d6
  F test/collateB.test 1e68906951b846570f29f20102ed91d29e634854ee47454d725f2151ecac0b95
  F test/colmeta.test 2c765ea61ee37bc43bbe6d6047f89004e6508eb1
- F test/colname.test 08948a4809d22817e0e5de89c7c0a8bd90cb551b
+ F test/colname.test b111edd2a84f558567320904bb94c779d7eec47254265b5f0a3d1f3e52cc28e0
 +F test/concfault.test 500f17c3fcfe7705114422bcc6ddd3c740001a43
 +F test/concurrent.test 75977c464f9613045dfa45eb9871aca0c51c2d67a6c89ccd19d47a88c5168cfe
 +F test/concurrent2.test 9dfbeb0a323733fe1d13443371734bb94a674dbf777f464365475903873111f8
 +F test/concurrent3.test f4af1cf1220908c6dd5694923621c19e999b78cd997e2646285f08a52bcb4170
 +F test/concurrent4.test 653de3066911acfb9dcf3802bf4f1981b392b86c11f75e2c38ed1abfdd162293
 +F test/concurrent5.test d5d7d9d404a9b4502464fc097c1fc5c3012bb4f1b063fae7ad707ca983fc86c5
  F test/conflict.test 029faa2d81a0d1cafb5f88614beb663d972c01db
  F test/conflict2.test bb0b94cf7196c64a3cbd815c66d3ee98c2fecd9c
  F test/conflict3.test a83db76a6c3503b2fa057c7bfb08c318d8a422202d8bc5b86226e078e5b49ff9
@@@ -1556,9 -1546,9 +1557,9 @@@ F test/wordcount.c 06efb84b7c48a4973c2c
  F test/zeroblob.test 3857870fe681b8185654414a9bccfde80b62a0fa
  F test/zerodamage.test e59a56443d6298ecf7435f618f0b27654f0c849e
  F tool/GetFile.cs a15e08acb5dd7539b75ba23501581d7c2b462cb5
- F tool/GetTclKit.bat 6afa640edc7810725aec61c3076ac617c4aaf0b7
+ F tool/GetTclKit.bat 8995df40c4209808b31f24de0b58f90930239a234f7591e3675d45bfbb990c5d
  F tool/Replace.cs 02c67258801c2fb5f63231e0ac0f220b4b36ba91
 -F tool/addopcodes.tcl edbd53806bf20e25af2373ad0c091be4385081c1aa1813b916bf093f94ed8380
 +F tool/addopcodes.tcl 247fc242e71ec4e540438351e5f3a31830c908ca29bf91212c192a74fc410a74
  F tool/build-all-msvc.bat c12328d06c45fec8baada5949e3d5af54bf8c887 x
  F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367
  F tool/cg_anno.tcl f95b0006c52cf7f0496b506343415b6ee3cdcdd3 x
@@@ -1648,7 -1638,8 +1649,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 44c760d150b494ddd88382360cfcc4734fec936ed620f88b9df33ea7215c2fc2
- R e43e51f268de0c519f41dfe98cdb868f
 -P 0c77935cf9949099d834ec51384c1d4dcdaf7b4422c859c9fce6d3cb3bde2645 ac1fd6beb6c804af5faf1e06a51177a8316007ff9e718c398bd7a24d2ecc4ed3
 -R 0baf627cb47530fd453d60ae728f6e16
 -T +closed ac1fd6beb6c804af5faf1e06a51177a8316007ff9e718c398bd7a24d2ecc4ed3
++P 58553d61d199477f88ea9b45055ddaf821eca2aff1bf67c7d81fa80b23c2575a 95e8f31658254dd2df3eeaae337aff0fe2125d170ae966c74f4fc70400e099b1
++R 252dd9c29ac6b4f2dc62f376b245c176
  U drh
- Z 893b46e0693cb4cb333312e0b8e9a7df
 -Z 5c8b473184a93b34c81627bf252d49c0
++Z 6d8f10a1062df40e1e72bdec4afe409c

diff --cc manifest.uuid
index c116e6c3aaa3fa685aa83553b8df940c15f9f865,951d33a66683b1c2dd757bfe03be3744af3a7c2b..c1f37c81198fec26682425a9ee0d695ec22b60e6
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 58553d61d199477f88ea9b45055ddaf821eca2aff1bf67c7d81fa80b23c2575a
 -95e8f31658254dd2df3eeaae337aff0fe2125d170ae966c74f4fc70400e099b1
++aafe1fec803ddf207bbcb3c669da0a9639411375fc04a52066dde4eb99c3c11b

diff --cc src/build.c
Simple merge

diff --cc src/main.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vacuum.c
Simple merge

diff --cc src/vdbe.c
index 14aa92dad75aa01a519d8ed8b3389765c4f91ad0,d9900f383431931e359c9c1f7133f48f06abbd1d..869cf60fd7007da23e51c35236449c1abb221db7
--- 1/src/vdbe.c
--- 2/src/vdbe.c
+++ b/src/vdbe.c
@@@ -3278,9 -3248,8 +3278,9 @@@ case OP_SetCookie: 
    rc = sqlite3BtreeUpdateMeta(pDb->pBt, pOp->p2, pOp->p3);
    if( pOp->p2==BTREE_SCHEMA_VERSION ){
      /* When the schema cookie changes, record the new cookie internally */
 +    assert( db->bConcurrent==0 );
      pDb->pSchema->schema_cookie = pOp->p3;
-     db->flags |= SQLITE_InternChanges;
+     db->mDbFlags |= DBFLAG_SchemaChange;
    }else if( pOp->p2==BTREE_FILE_FORMAT ){
      /* Record changes in the file format */
      pDb->pSchema->file_format = pOp->p3;

diff --cc src/vdbeaux.c
Simple merge