Merge all the latest trunk enhancements.

FossilOrigin-Name: 213c61cb82d4ee51cc638fc5bb2b54cd51b963c40d088b2f01caf77032ea32fb

diff --cc ext/session/sqlite3session.c
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 6d77845a0c00c7a962370279203f12f3ea10efcb,4932481eb6242cc8cb5f73d4faac646020bc30ba..96896f870839de752d867de878af6b5069ffcfda
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Remove\ssqlite3_log()\sand\sabort()\scalls\sadded\sto\sthis\sbranch\sto\sdebug\sthe\npointer-map\sproblem\s([fda22108]).
- D 2017-06-10T17:23:20.663
- F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 -C Enhance\sthe\sbuilt-in\sdate/time\sfunctions\sso\sthat\sthey\scan\sbe\sused\sin\nCHECK\sconstraints,\sin\sthe\sWHERE\sclause\sor\spartial\sindexes,\sand\sindex\nexpressions,\sprovided\sthat\snone\sof\sthe\snon-deterministic\skeywords\n("now",\s"localtime",\s"utc")\sare\sused\sas\sarguments.
 -D 2017-07-20T15:08:43.378
++C Merge\sall\sthe\slatest\strunk\senhancements.
++D 2017-07-20T17:47:12.460
+ F Makefile.in d9873c9925917cca9990ee24be17eb9613a668012c85a343aef7e5536ae266e8
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 8eeb80162074004e906b53d7340a12a14c471a83743aab975947e95ce061efcc
- F README.md 2b15fae33852f2f53996774c21fb41e1d94181c4401a0e43ac93e11f2cc901b9
- F VERSION 6035ef7e627075d9a9194304c3a07acb2736a0abd0dd980a7ea75a3a45719e86
+ F Makefile.msc 02b469e9dcd5b7ee63fc1fb05babc174260ee4cfa4e0ef2e48c3c6801567a016
+ F README.md f5c87359573c4d255425e588a56554b50fdcc2afba4e017a2e02a43701456afd
+ F VERSION 87f1498f27e398bce3da2fa8125c9879a38ed9d87e4b5fb922b351de1e25cadb
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -296,10 -344,8 +344,10 @@@ F ext/rtree/rtree_util.tcl 06aab2ed5b82
  F ext/rtree/sqlite3rtree.h 9c5777af3d2921c7b4ae4954e8e5697502289d28
  F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
  F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 +F ext/session/changebatch1.test 9ceaa8f7b2a505933e250fbe6cbc550e4ce1e59d
 +F ext/session/changebatchfault.test be49c793219bf387ad692a60856b921f0854ad6d
  F ext/session/changeset.c 4ccbaa4531944c24584bf6a61ba3a39c62b6267a
- F ext/session/session1.test c8a50e0e8581dc1a00e832aa59bb61f180404d44
+ F ext/session/session1.test 736d7ff178662f0b717c37f46531b84a5ce0210ccb0c4edf629c55dbcbbc3ea1
  F ext/session/session2.test 284de45abae4cc1082bc52012ee81521d5ac58e0
  F ext/session/session3.test ce9ce3dfa489473987f899e9f6a0f2db9bde3479
  F ext/session/session4.test 457b02bdc349eb01151e54de014df77abd3c08c8
@@@ -320,18 -367,16 +369,18 @@@ F ext/session/sessiondiff.test ad13dd65
  F ext/session/sessionfault.test da273f2712b6411e85e71465a1733b8501dbf6f7
  F ext/session/sessionfault2.test 04aa0bc9aa70ea43d8de82c4f648db4de1e990b0
  F ext/session/sessionwor.test 2f3744236dc8b170a695b7d8ddc8c743c7e79fdc
 -F ext/session/sqlite3session.c cc127222a9ea6f4eaa31281aa9da924f5244f6099be0ee526c950684fb3513a6
 -F ext/session/sqlite3session.h d4db650adfcc7a4360e9f12a09c2d117b1db6b53
 -F ext/session/test_session.c eb0bd6c1ea791c1d66ee4ef94c16500dad936386
 +F ext/session/sqlite3changebatch.c d5553b79e012ee2cb06c0a96bdf9dfe19e66354390ea0036cc46c4953142d517
 +F ext/session/sqlite3changebatch.h e72016998c9a22d439ddfd547b69e1ebac810c24
- F ext/session/sqlite3session.c 459b276e12065e34036f19cdc72528ac49f2d9977d0a142b9ef9b38122fe7ec0
++F ext/session/sqlite3session.c 97e478b348bcf22bc39e91430bd077e1030c6529009c8d7fb3d6731e40b02436
 +F ext/session/sqlite3session.h ec4463a01e6e1c942f618f8944ceb96f05f5fec06f8de9af6f269fc216df1c68
 +F ext/session/test_session.c badd5da3cb561564b093745f7d843430d1d76347
  F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
  F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
  F ext/userauth/userauth.c 3410be31283abba70255d71fd24734e017a4497f
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk a8a58a3b44912e2ab0c6e52a94f8dd97282e4ce192b2f760f81adfa62ec51512
 -F main.mk 5b7d72ab03dd70aa1401f934d31e85aefd6fc542eb58094d7a95d6921390b2d0
++F main.mk ab1d9ee22955523a6288b3a3c887e480e80ded44ac429bcaee744c35a90b2d1d
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -343,36 -388,36 +392,36 @@@ F spec.template 86a4a43b99ebb3e75e6b9a7
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
  F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
- F src/alter.c 3b23977620ce9662ac54443f65b87ba996e36121
+ F src/alter.c 850ede4e607f12fa25ea4f3cb6ece2b2e29d1aa50e3f786ce49d615788849552
  F src/analyze.c 0d0ccf7520a201d8747ea2f02c92c26e26f801bc161f714f27b9f7630dde0421
- F src/attach.c 8c476f8bd5d2afe11d925f890d30e527e5b0ce43
+ F src/attach.c 3bd555e28382603e80d430dfebb2270f86e1e375b4c4be3e1ab1aec3a0c44943
  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 5a93ba67ecdcde5e0112c355dffbcb067891c9f2211dbc1e232796e279855de6
- F src/btree.h 14e99cc2b666beb60322173c761d16b668ec2e07c18bbb74e8a49fe85946f8a0
- F src/btreeInt.h 7429915fc8f51bbd78b7ac023aa4afbe5b9660fc1e6970f144b07540a34a4623
- F src/build.c ba3f389668754c407805bbc5f8ab140f063ba6b04a6a86f63006b63b3c7319a8
- F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
 -F src/btree.c f55ea8f456d103328d61076be40fa39acbfea05eaa4eccfed275532a63c867c4
 -F src/btree.h 3edc5329bc59534d2d15b4f069a9f54b779a7e51289e98fa481ae3c0e526a5ca
 -F src/btreeInt.h 97700795edf8a43245720414798b7b29d8e465aef46bf301ffacd431910c0da1
 -F src/build.c 74108007d286232fb4290464ee5452fa860c26215f8caa0e6c7cbf69a6fafe8f
++F src/btree.c b3d5ea919c2eef869306ec09e1b6e64a8b9fdd7421f93e6913f5c48b51b4ea6c
++F src/btree.h e8045998d865a21de226a417467cc64cf9d66e41b91b7436539f99ee464b5402
++F src/btreeInt.h 70236a051364c7d4b8c0513b118925a61cd24c2511ef3991e62732cfc8624c15
++F src/build.c 62faff0876fdce2b18f14312e3e891f3f366ee493c8fb48d844f9cbae15e6a02
+ F src/callback.c 8e14b60d1ed1c87c02cb5f121ecda99224f2aea6524a77ee6f72c9b5c7110f84
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
- F src/ctime.c 47d91a25ad8f199a71a5b1b7b169d6dd0d6e98c5719eca801568798743d1161c
- F src/date.c cc42a41c7422389860d40419a5e3bce5eaf6e7835c3ba2677751dc653550a5c7
- F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
- F src/delete.c 665e705641e5815c3f32d05820d1a5aa630274e568af73f377fdbc614fcf40b4
- F src/expr.c 30f61b7d8236def0e99485651e5d983a102afa4cbc8b1ef0ab19ccb1f3841f99
+ F src/ctime.c 928954802b1397d9fb1378c7eb702c94b4735bbab1d5793e21b6a77734f56a1b
+ F src/date.c 48f743d88bbe88f848532d333cca84f26e52a4f217e86f86be7fc1b919c33d74
+ F src/dbstat.c 7a4ba8518b6369ef3600c49cf9c918ad979acba610b2aebef1b656d649b96720
+ F src/delete.c 939bd15e6b54b82b951e1c0ffc2ff2b4ab579196780a1f6d394e47bd6f799b6c
+ F src/expr.c fdb2fc465cabbf372fecad1fc2b291758bec74150b4db0fb945332e09df28a0e
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
- F src/fkey.c db65492ae549c3b548c9ef1f279ce1684f1c473b116e1c56a90878cd5dcf968d
- F src/func.c 9d52522cc8ae7f5cdadfe14594262f1618bc1f86083c4cd6da861b4cf5af6174
+ F src/fkey.c 5ff2c895fe087756d8085dc1a9bc229b5670e2a65c3929dd87c71e43649af333
+ F src/func.c e2854b19386b93ad6b498a3f3b7d6baa98ec14cfe84530fb12fce4414263d871
  F src/global.c 8a6ab6b4d91effb96ffa81b39f0d70c862abca157f8aaa194600a4a8b7923344
- F src/hash.c 63d0ee752a3b92d4695b2b1f5259c4621b2cfebd
+ F src/hash.c a12580e143f10301ed5166ea4964ae2853d3905a511d4e0c44497245c7ce1f7a
  F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c d4bb3a135948553d18cf992f76f7ed7b18aa0327f250607b5a6671e55d9947d5
- F src/legacy.c e88ed13c2d531decde75d42c2e35623fb9ce3cb0
- F src/loadext.c a72909474dadce771d3669bf84bf689424f6f87d471fee898589c3ef9b2acfd9
- F src/main.c 2ff34ece3b1b282ecbfb5c0870a4ba8fff6e8a5699189c20cc6aaa4bfe752862
+ F src/insert.c 487d2c1cd8d549f8d9492377ecc4d2f507b1bd5185e96c54389f6b607dce854c
+ F src/legacy.c 134ab3e3fae00a0f67a5187981d6935b24b337bcf0f4b3e5c9fa5763da95bf4e
+ F src/loadext.c 20865b183bb8a3723d59cf1efffc3c50217eb452c1021d077b908c94da26b0b2
 -F src/main.c 3a9da9e3974d8a32ef6ca15b75503d540af22d284beb75bc7f0d93254ca3f8f7
++F src/main.c 562527c0e4d67f890f64bb0eccb832a57505a8621f6336a9bcd7f96b91f94d09
  F src/malloc.c e20bb2b48abec52d3faf01cce12e8b4f95973755fafec98d45162dfdab111978
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -394,32 -439,33 +443,33 @@@ F src/os_setup.h 0dbaea40a7d36bf311613d
  F src/os_unix.c 30e2c43e4955db990e5b5a81e901f8aa74cc8820
  F src/os_win.c 2a6c73eef01c51a048cc4ddccd57f981afbec18a
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c 817afaac17f7c4b1282d9aa283f10fc4b58d5d1e4afb12f84c46038904311650
 -F src/pager.c 14f6982c470c05b8e85575c69e9c1712010602e20400f8670d8699e21283e0e4
 -F src/pager.h f2a99646c5533ffe11afa43e9e0bea74054e4efa
 -F src/parse.y e384cb73f99e1b074085c974b37f4d830e885359e4b60837e30f7d67c16ba65b
++F src/pager.c 7666599a49ff5098cfaea232cae118ad9afda37a96c9afa8f6db656a977c9cb6
 +F src/pager.h ba7b3fbb18f78835a7368d66530bf21d6782e3e640d79c9550d218742c0b07ce
- F src/parse.y 21660e5224d1e1635a4ad45ad4365c8f67153b8081b7a11e35629844ecb48ab0
++F src/parse.y e4dbcc6136fc4f3084cedd41036401eafd336c5f7cb33bc516fed913a46cac2a
  F src/pcache.c 62835bed959e2914edd26afadfecce29ece0e870
- F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
+ F src/pcache.h 521bb9610d38ef17a3cc9b5ddafd4546c2ea67fa3d0e464823d73c2a28d50e11
  F src/pcache1.c 1195a21fe28e223e024f900b2011e80df53793f0356a24caace4188b098540dc
- F src/pragma.c 2362670a9d28b71708aecb2b9b10b3f7be71f4c950961c07e81dc400e3ce6371
- F src/pragma.h 37a1311d0388db480388d7ec09054f7103045eff20d4971f8a433b77f40b9921
- F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a
+ F src/pragma.c cd6aeda3587be6c5c08f9b2d45eae6068666a03c9d077c8c43cdb85fb0aa70f2
+ F src/pragma.h bb83728944b42f6d409c77f5838a8edbdb0fe83046c5496ffc9602b40340a324
+ F src/prepare.c dd250f904739b1dc449c131ac527c35e3424d94082dd111321bd83f80c6bb0fe
  F src/printf.c 8757834f1b54dae512fb25eb1acc8e94a0d15dd2290b58f2563f65973265adb2
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
- F src/resolve.c 3e518b962d932a997fae373366880fc028c75706
+ F src/resolve.c 4324a94573b1e29286f8121e4881db59eaedc014afeb274c8d3e07ed282e0e20
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c c444ca057d48cf1a4eb8f6a58fbc13418a7f83ae94a6bd6f29f7ad6c704a9e4c
- F src/shell.c a37d96b20b3644d0eb905df5aa7a0fcf9f6e73c15898337230c760a24a8df794
- F src/sqlite.h.in 6eae6c87571d142f5aee27d49b13b5aec06bae40c706494e8565a64ab68b03f5
+ F src/select.c c6bf96a7f9d7d68f929de84738c599a30d0a725ab0b54420e70545743cd5ee7b
+ F src/shell.c bd6a37cbe8bf64ef6a6a74fdc50f067d3148149b4ce2b4d03154663e66ded55f
+ F src/shell.c.in b5725acacba95ccefa57b6d068f710e29ba8239c3aa704628a1902a1f729c175
 -F src/sqlite.h.in dad804d4e1979a2ddec33cc8da6aa50c04e6ba0dcb4058e7b3609588d010e041
++F src/sqlite.h.in 7a0789ad7159a2c7995eef91c246e164aeb3aef8622bf66dacfe7dfd180cc0cb
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h 58fd0676d3111d02e62e5a35992a7d3da5d3f88753acc174f2d37b774fbbdd28
- F src/sqliteInt.h b7e590bc90ebee66cf79fb41312a7cdbce881b7db316d934c159294ff6087fd5
+ F src/sqlite3ext.h 967154985ed2ae62f90d9029bb5b5071793d847f1696a2ebe9e8cc0b042ae60b
 -F src/sqliteInt.h 96197a18f041b9ab99e6cee0db39dbf771ac7762d9f0f63d9e719285f0478664
++F src/sqliteInt.h 6536c0b96e78986ab148723d7f2acb3749bbf1b26df8fd829821fe93ccd984bd
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
- F src/tclsqlite.c c8cf60d0c5411d5e70e7c136470d29dbe760d250f55198b71682c67086524e4a
- F src/test1.c 108f95744b7c949ac806ad67a4be5d9e283bbe2011639a1b7ca512a1c52e908a
+ F src/tclsqlite.c 2c29b0b76e91edfd1b43bf135c32c8674710089197327682b6b7e6af88062c3d
 -F src/test1.c cfb78b728b37ae3a2b14fe1b3a6c766e0da41370eda112594e698c94011b622e
++F src/test1.c fa5a14d0a2576d38435c791ead17e7c3c1734bc10d231a8623cd6802b260f8ee
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
- F src/test3.c d03f5b5da9a2410b7a91c64b0d3306ed28ab6fee
+ F src/test3.c b8434949dfb8aff8dfa082c8b592109e77844c2135ed3c492113839b6956255b
  F src/test4.c 18ec393bb4d0ad1de729f0b94da7267270f3d8e6
  F src/test5.c 328aae2c010c57a9829d255dc099d6899311672d
  F src/test6.c 004ad42f121f693b8cbe060d1a330678abc61620
@@@ -432,7 -478,7 +482,7 @@@ F src/test_backup.c bf5da90c9926df0a4b9
  F src/test_bestindex.c d23f80d334c59662af69191854c76b8d3d0c8c96
  F src/test_blob.c f65ac717da2618691cf9dad094e6da0219dcd208
  F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
- F src/test_config.c d3925a89099af6407929fe642adeb950b7e6150d738b4113b2a62ae3eb95a7cd
 -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
@@@ -468,30 -514,30 +518,30 @@@ F src/test_windirent.h 5d67483a55442e31
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
  F src/tokenize.c 1003d6d90c6783206c711f0a9397656fa5b055209f4d092caa43bb3bf5215db5
- F src/treeview.c 6cf8d7fe9e63fae57dad1bb57f6615e14eac0c527e43d868e805042cae8ed1f7
- F src/trigger.c c9f0810043b265724fdb1bdd466894f984dfc182
+ F src/treeview.c 2ee4a5dada213d5ab08a742af5c876cee6f1aaae65f10a61923f3fb63846afef
+ F src/trigger.c d1cae560bfacc8bfb3a072d73658245c1714c0389097da69b4cb23877a082d7e
  F src/update.c c443935c652af9365e033f756550b5032d02e1b06eb2cb890ed7511ae0c051dc
- F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
+ F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
  F src/util.c fc081ec6f63448dcd80d3dfad35baecfa104823254a815b081a4d9fe76e1db23
- F src/vacuum.c 8aa1db0b7052269890ac03089ed030eefa88480897915f727703ca74d0676380
- F src/vdbe.c aa018a14de2d1ab6ea45c4c14f75ef2a08791b6a7ec68e92895b32cf5aff2ec2
- F src/vdbe.h f7d1456e28875c2dcb964056589b5b7149ab7edf39edeca801596a39bb3d3848
- F src/vdbeInt.h 1ecdacc1322fdd3241ec30c32a480e328a6f864e532dc53fae8e0ab68121aebf
- F src/vdbeapi.c dc904b3c5e459727993c2421e653e29d63223846d129fae98adc782b0a996481
- F src/vdbeaux.c 5dfd5adf3c8c803feccb709d2b626759b20bd535abcd36a1c157429dfa29b516
 -F src/vacuum.c 874c0f2f15ab2908748297d587d22d485ea96d55aaec91d4775dddb2e24d2ecf
 -F src/vdbe.c 1e541ec7ff409bbabcc6b4f154957296fff5827c16c2ab0056348acae75685bf
++F src/vacuum.c ab48f1d3aa9483c02e7d518ec5d438432eb441f1d3b9fce726c64ac45a155afe
++F src/vdbe.c 1fd60b07bf2036970504f27a48f46159653e93798f2c29b1d28f95eeb0119c4e
+ F src/vdbe.h d50cadf12bcf9fb99117ef392ce1ea283aa429270481426b6e8b0280c101fd97
+ F src/vdbeInt.h 19bd04a4211fe56c712ab35b48be77fd5a0579b851e9dea2cb8deade359b72b9
+ F src/vdbeapi.c 52844a5a71712197be45f1c63d730c48a745c7457c959465cfb2b969af40a266
 -F src/vdbeaux.c 42e215cc6f69e91eebdd2b886ec1ff2b0d5e44331bd8b88a0a44e78bbeed7133
++F src/vdbeaux.c ca3e9b2391a78b7259d633033cc10045cec53f536ad7e5d6549b662b46246e32
  F src/vdbeblob.c 359891617358deefc85bef7bcf787fa6b77facb9
- F src/vdbemem.c 2c70f8f5de6c71fb99a22c5b83be9fab5c47cdd8e279fa44a8c00cfed06d7e89
- F src/vdbesort.c e72fe02a2121386ba767ede8942e9450878b8fc873abf3d1b6824485f092570c
+ F src/vdbemem.c fe8fce1cdc258320b465934039fe4b1230d63f81d6b81b1eac775b6eec00af0d
+ F src/vdbesort.c f512c68d0bf7e0105316a5594c4329358c8ee9cae3b25138df041d97516c0372
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
  F src/vtab.c 35b9bdc2b41de32a417141d12097bcc4e29a77ed7cdb8f836d1d2305d946b61b
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 40c543f0a2195d1b0dc88ef12142bea690009344
 -F src/wal.h 06b2a0b599cc0f53ea97f497cf8c6b758c999f71
 +F src/wal.c e006353c3578071a457888aedd5eec9c8f1ba31ba11ddac4084c91c80478ca16
 +F src/wal.h 1ea51dc499d6451529b822a8aaac053eafeef10b7fd9e5a4c9cc413182be429f
- F src/walker.c b71a992b413b3a022572eccf29ef4b4890223791
- F src/where.c c6352f15be5031907c68bcbde96cad1a6da20e9f4051d10168a59235de9a8566
- F src/whereInt.h 2a4b634d63ce488b46d4b0da8f2eaa8f9aeab202bc25ef76f007de5e3fba1f20
- F src/wherecode.c 8ad48867660519e262a401720845dc76934f86f558ec9606335fafcd7a2554f8
- F src/whereexpr.c a2fe3811d45af45a5c6667caabc15e01054fe6228c64e86e1f7d2ba5ef5284f9
+ F src/walker.c a7ca64ce08a83a20d32186fbe06bca9234e348cfcf07959ee322fdc3e8a6173a
+ F src/where.c cbe8ddffbcec7ce86f7a800fe8fd10aee412c76c87e0dd3732a1682e68d74cd9
+ F src/whereInt.h 93bb90b77d39901eda31b44d8e90da1351193ccfe96876f89b58a93a33b84c3d
+ F src/wherecode.c c0c4c31573486cd14bb2cbfc63e41eda591609e5190416261999f211bf97abc1
+ F src/whereexpr.c bf983d2d33e325cd63a36c40b8de289fd3d7b4d9f2db9052fb8f59f7161a34a0
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
@@@ -1380,10 -1423,9 +1433,10 @@@ F test/triggerB.test 56780c031b454abac2
  F test/triggerC.test 302d8995f5ffe63bbc15053abb3ef7a39cf5a092
  F test/triggerD.test 8e7f3921a92a5797d472732108109e44575fa650
  F test/triggerE.test 15fa63f1097db1f83dd62d121616006978063d1f
- F test/triggerF.test 55b1eb13433997faac3a4948c1d8252f6c8c636b
+ F test/triggerF.test 6a8c22bd058cf467f0c7d112afe87f7a8c579c0c4681b914b8f19020f48528a4
  F test/triggerG.test 175cafdc6399d85231a09e82e051b0e45a2fd1f23dd08ae715bc359716149ab6
  F test/tt3_checkpoint.c 9e75cf7c1c364f52e1c47fd0f14c4340a9db0fe1
 +F test/tt3_core.c 8cd89ead95410f70e7fb02c79f1e040f9c5ad5cf
  F test/tt3_index.c 39eec10a35f57672225be4d182862152896dee4a
  F test/tt3_lookaside1.c 0377e202c3c2a50d688cb65ba203afeda6fafeb9
  F test/tt3_stress.c c57d804716165811d979d4a719e05baccd79277f
@@@ -1523,16 -1567,18 +1578,18 @@@ F tool/libvers.c caafc3b689638a1d88d44b
  F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
  F tool/logest.c 11346aa019e2e77a00902aa7d0cabd27bd2e8cca
  F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439
- F tool/mkautoconfamal.sh ab527af92dc684028e0d1db3fa6241787fae78987b99e5bbac7eb87e1970b8e5
- F tool/mkkeywordhash.c f5ecfd09b56b8badc644554ed38c86056152b893
+ F tool/mkautoconfamal.sh e855df211ecbcc7131dee817110ff386cfb112f7
+ F tool/mkctimec.tcl dd183b73ae1c28249669741c250525f0407e579a70482371668fd5f130d9feb3
 -F tool/mkkeywordhash.c 2e852ac0dfdc5af18886dc1ce7e9676d11714ae3df0a282dc7d90b3a0fe2033c
++F tool/mkkeywordhash.c 09ee7db43e6143fc6feb7490b9b56027efab5ae7257ee1f2014b07cd9eed1ec7
  F tool/mkmsvcmin.tcl cbd93f1cfa3a0a9ae56fc958510aa3fc3ac65e29cb111716199e3d0e66eefaa4
  F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
- F tool/mkopcodeh.tcl a01d2c1d8a6205b03fc635adf3735b4c523befd3
+ F tool/mkopcodeh.tcl bb04ab6e5e2000c91e0c69a597e7e36e002320d123e2e1944cb2819181b72ee9
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
- F tool/mkpragmatab.tcl 32bb40741df11bddc8451de9ea4d130e7b4476d8064794b1cf402ac110840fba
+ F tool/mkpragmatab.tcl 2144bc8550a6471a029db262a132d2df4b9e0db61b90398bf64f5b7b3f8d92cd
+ F tool/mkshellc.tcl 69c38ecd7b74b2b0799a35ce20e1e3998e504d8c99c100ca4b98ae9d8f6279bc
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl fef88397668ae83166735c41af99d79f56afaabb
- F tool/mksqlite3c.tcl 06b2e6a0f21cc0a5d70fbbd136b3e0a96470645e
+ F tool/mksqlite3c.tcl f6214285bec900d28441366ca31af327aade18bbc424b0480497966ec05bc43c
  F tool/mksqlite3h.tcl 51bd5e7e840a920388a5966c9f2ccc618f434c57bd68c1bab4085b2553e1e237
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl b9e0777a213c23156b6542842c238479e496ebf5
@@@ -1591,7 -1637,8 +1648,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 8e311a6dba202e8733830d8f31b8f0ce11eaefb3a0ab5e5e95ac0d2e5136043b
- R 6be74687e7f9ac02928f68f0a8d639cb
- U dan
- Z a53782ebd88a9fbbd1f17403d5393b28
 -P d14fc621e918915bbf8e04597eb238ea78dff3d9c5eb4402cb88692d00dbdfee b7f70c7fcabc10b8b3e62fe5ac68476cec23acaee037c7250ff70bca3f3ab541
 -R 636bb2618e46215e27cfa1dc613ec36a
 -T +closed b7f70c7fcabc10b8b3e62fe5ac68476cec23acaee037c7250ff70bca3f3ab541
++P 79544fc2856f30cac8b0962d00698974e8918562f09769a68264d17e1e1176fe a90c062d46c63a1e6f83064b1c5afb26a16e93b6ee8620ca46d169fdb325c488
++R 5ca93a16d61103201899491d16be4992
+ U drh
 -Z 8d21c041010891259262753e78bdd45f
++Z 646329efaa2d2b6e9e011be806365053

diff --cc manifest.uuid
index 14de91ea10f2a762c5ff88b5eef44a14121e73cd,9f9976a1090f5717aeea19983e6995d5df6bb402..4fc907c6af2908932920f89bf145b3708b7e539c
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 79544fc2856f30cac8b0962d00698974e8918562f09769a68264d17e1e1176fe
 -a90c062d46c63a1e6f83064b1c5afb26a16e93b6ee8620ca46d169fdb325c488
++213c61cb82d4ee51cc638fc5bb2b54cd51b963c40d088b2f01caf77032ea32fb

diff --cc src/btree.c
Simple merge

diff --cc src/btree.h
Simple merge

diff --cc src/btreeInt.h
Simple merge

diff --cc src/build.c
Simple merge

diff --cc src/main.c
index 5cceb1c08e4640bb586c3619d93109651de9b918,747c25ea8ddc86bbc7992af28994256107dd1257..348964b564babc509a7576841d7dbf7fd30e9fac
--- 1/src/main.c
--- 2/src/main.c
+++ b/src/main.c
@@@ -4096,33 -4120,54 +4120,83 @@@ void sqlite3_snapshot_free(sqlite3_snap
  }
  #endif /* SQLITE_ENABLE_SNAPSHOT */
  
 +SQLITE_EXPERIMENTAL int sqlite3_wal_info(
 +  sqlite3 *db, const char *zDb, 
 +  unsigned int *pnPrior, unsigned int *pnFrame
 +){
 +  int rc = SQLITE_OK;
 +
 +#ifndef SQLITE_OMIT_WAL
 +  Btree *pBt;
 +  int iDb;
 +
 +#ifdef SQLITE_ENABLE_API_ARMOR
 +  if( !sqlite3SafetyCheckOk(db) ){
 +    return SQLITE_MISUSE_BKPT;
 +  }
 +#endif
 +
 +  sqlite3_mutex_enter(db->mutex);
 +  iDb = sqlite3FindDbName(db, zDb);
 +  if( iDb<0 ){
 +    return SQLITE_ERROR;
 +  }
 +  pBt = db->aDb[iDb].pBt;
 +  rc = sqlite3PagerWalInfo(sqlite3BtreePager(pBt), pnPrior, pnFrame);
 +  sqlite3_mutex_leave(db->mutex);
 +#endif   /* SQLITE_OMIT_WAL */
 +
 +  return rc;
 +}
 +
+ #ifndef SQLITE_OMIT_COMPILEOPTION_DIAGS
+ /*
+ ** Given the name of a compile-time option, return true if that option
+ ** was used and false if not.
+ **
+ ** The name can optionally begin with "SQLITE_" but the "SQLITE_" prefix
+ ** is not required for a match.
+ */
+ int sqlite3_compileoption_used(const char *zOptName){
+   int i, n;
+   int nOpt;
+   const char **azCompileOpt;
+  
+ #if SQLITE_ENABLE_API_ARMOR
+   if( zOptName==0 ){
+     (void)SQLITE_MISUSE_BKPT;
+     return 0;
+   }
+ #endif
+ 
+   azCompileOpt = sqlite3CompileOptions(&nOpt);
+ 
+   if( sqlite3StrNICmp(zOptName, "SQLITE_", 7)==0 ) zOptName += 7;
+   n = sqlite3Strlen30(zOptName);
+ 
+   /* Since nOpt is normally in single digits, a linear search is 
+   ** adequate. No need for a binary search. */
+   for(i=0; i<nOpt; i++){
+     if( sqlite3StrNICmp(zOptName, azCompileOpt[i], n)==0
+      && sqlite3IsIdChar((unsigned char)azCompileOpt[i][n])==0
+     ){
+       return 1;
+     }
+   }
+   return 0;
+ }
  
+ /*
+ ** Return the N-th compile-time option string.  If N is out of range,
+ ** return a NULL pointer.
+ */
+ const char *sqlite3_compileoption_get(int N){
+   int nOpt;
+   const char **azCompileOpt;
+   azCompileOpt = sqlite3CompileOptions(&nOpt);
+   if( N>=0 && N<nOpt ){
+     return azCompileOpt[N];
+   }
+   return 0;
+ }
+ #endif /* SQLITE_OMIT_COMPILEOPTION_DIAGS */

diff --cc src/pager.c
Simple merge

diff --cc src/parse.y
index 8c500c268d5d4e3e06ac56ffc0c9820b43fa578f,129686ad575ad9499e7f38beb1b0b05186a1d8cb..124e88c95a5cf8cabe739569d9fc364e9eb05d98
--- 1/src/parse.y
--- 2/src/parse.y
+++ b/src/parse.y
@@@ -146,19 -139,9 +146,18 @@@ trans_opt ::= TRANSACTION nm
  transtype(A) ::= .             {A = TK_DEFERRED;}
  transtype(A) ::= DEFERRED(X).  {A = @X; /*A-overwrites-X*/}
  transtype(A) ::= IMMEDIATE(X). {A = @X; /*A-overwrites-X*/}
 -transtype(A) ::= EXCLUSIVE(X). {A = @X; /*A-overwrites-X*/}
 +transtype(A) ::= ID(X). {
 +   Token *p = &X;
 +   if( p->n==9 && sqlite3_strnicmp(p->z,"exclusive",9)==0 ){
 +     A = TK_EXCLUSIVE;
 +   }else if( p->n==10 && sqlite3_strnicmp(p->z,"concurrent",10)==0 ){
 +     A = TK_CONCURRENT;  /*A-overwrites-X*/
 +   }else{
 +     parserSyntaxError(pParse, p);
 +   }
 +}
- cmd ::= COMMIT trans_opt.      {sqlite3CommitTransaction(pParse);}
- cmd ::= END trans_opt.         {sqlite3CommitTransaction(pParse);}
- cmd ::= ROLLBACK trans_opt.    {sqlite3RollbackTransaction(pParse);}
+ cmd ::= COMMIT|END(X) trans_opt.   {sqlite3EndTransaction(pParse,@X);}
+ cmd ::= ROLLBACK(X) trans_opt.     {sqlite3EndTransaction(pParse,@X);}
  
  savepoint_opt ::= SAVEPOINT.
  savepoint_opt ::= .

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/test_config.c
Simple merge

diff --cc src/vacuum.c
Simple merge

diff --cc src/vdbe.c
index 30150954a2cc70d3bb578db4485633e47b632e30,3e6231e0d886ef922b8af3827dc011cfae098b87..14aa92dad75aa01a519d8ed8b3389765c4f91ad0
--- 1/src/vdbe.c
--- 2/src/vdbe.c
+++ b/src/vdbe.c
@@@ -6589,15 -6460,7 +6491,15 @@@ case OP_Expire: 
  */
  case OP_TableLock: {
    u8 isWriteLock = (u8)pOp->p3;
-   if( isWriteLock || 0==(db->flags&SQLITE_ReadUncommitted) ){
 +#ifndef SQLITE_OMIT_CONCURRENT
 +  if( isWriteLock && db->bConcurrent && pOp->p2==1 ){
 +    rc = SQLITE_ERROR;
 +    sqlite3VdbeError(p, 
 +        "cannot modify database schema within CONCURRENT transaction");
 +    goto abort_due_to_error;
 +  }
 +#endif
+   if( isWriteLock || 0==(db->flags&SQLITE_ReadUncommit) ){
      int p1 = pOp->p1; 
      assert( p1>=0 && p1<db->nDb );
      assert( DbMaskTest(p->btreeMask, p1) );

diff --cc src/vdbeaux.c
Simple merge

diff --cc tool/mkkeywordhash.c
Simple merge