Merge recent enhancements from trunk, and especially the pragma-as-vtab

change.

FossilOrigin-Name: 4b1e780433fe72611b065962e419965c6644f430

diff --cc Makefile.in
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index a63ddd7028424aa89a90be21bbc453fe050aaafd,8fda08169ade0274a583be75569dad88491979e6..f17249c72631dd9a4d2c05468faad9f01709a020
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\sall\sthe\slatest\sperformance\senhancements\sfrom\strunk.
- D 2016-12-12T16:15:40.566
- F Makefile.in 49754a1b297c1d454e1008ae6cc26f0ce4be8d02
 -C Add\sthe\s".lint\sfkey-indexes"\scommand\sto\sthe\scommand-line\sshell.
 -D 2016-12-16T18:43:49.329
 -F Makefile.in c194b58fe00c370a48ac6ae6945e92a7781db1c8
++C Merge\srecent\senhancements\sfrom\strunk,\sand\sespecially\sthe\spragma-as-vtab\nchange.
++D 2016-12-16T21:29:42.129
++F Makefile.in f9d781832f4e9f4a833a020bd736e4d5f1ed412c
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
 +F Makefile.msc 16477ab34568b4cfd8abac4b5840f3dfc7806aec
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 661b3e6a778cfbfd7bdce8bbb1545b22f4b6f09e
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -315,7 -312,7 +315,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 846e0b6e723517f9b62b7b571f84b99879da50e0
 -F main.mk bd1149fdb5543e432a8530a0ea7642613a655bc1
++F main.mk 38978da90d2322ef899168c33be472d058318a21
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -334,10 -331,10 +334,10 @@@ F src/auth.c 930b376a9c56998557367e6f7f
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
- F src/btree.c 50bd8434b69c419767e5d25de78d549509c5c86b
 -F src/btree.c b2055dff0b94e03eaad48a760984a2d8e39244e6
++F src/btree.c 66e482529d76e74634db5499d997c16c8bdee221
  F src/btree.h 2349a588abcd7e0c04f984e15c5c777b61637583
  F src/btreeInt.h 10c4b77c2fb399580babbcc7cf652ac10dba796e
- F src/build.c 178f16698cbcb43402c343a9413fe22c99ffee21
+ F src/build.c 52970b6cf3cf3107551a5d6dd668b0b261b0b491
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 9f2296a4e5d26ebf0e0d95a0af4628f1ea694e7a
@@@ -375,29 -372,28 +375,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 15b855da41f52f16c3832e7670ada0416fb07eb6
 -F src/pager.c 81fe2bb847df537694ec39e28e8b3dc221c64a7d
 -F src/pager.h d1e944291030351f362a0a7da9b5c3e34e603e39
++F src/pager.c 3677b427b24c39b3d210a723a021d31bc474b6cc
 +F src/pager.h 366f586bbcb92b797b954d95bf322083e8e5cf5c
  F src/parse.y 29153738a7322054359320eb00b5a4cd44389f20
- F src/pcache.c 219fc5238d5c80e2990ab01e1459db3a96866447
+ F src/pcache.c 51070ec9b8251bbf9c6ea3d35fd96a458752929e
  F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
 -F src/pcache1.c e3967219b2a92b9edcb9324a4ba75009090d3953
 -F src/pragma.c d5adfe89ad7f3f45d4dbd25b96cbf3f6611aea2a
 +F src/pcache1.c 6d8c7bc6bbae077a0c76440cf32342a65dfeac75
- F src/pragma.c 7a32fcc81f3c765621dba31a248dfbeb0342b569
- F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
++F src/pragma.c f84626dbd0f6324177e89ce55adc8a041ecff1f2
+ F src/pragma.h f9b221b2c8949ea941dbee49934299e4ed5af41c
 -F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a
 +F src/prepare.c 601681ecade57127ffbb5df1e096a30f29eff54c
  F src/printf.c f94da4935d1dd25420ac50c6745db1deb35e07c1
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c bb070cf5f23611c44ab7e4788803684e385fc3fb
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c b4bd43e1233c87e8a7cf66150421997b0396417e
- F src/shell.c 9597efa50a4a27bc6440ad99cbcd7fff6957f514
+ F src/select.c e4c687333c5fa33b1ce05c37bfbea6e09d3dbee9
+ F src/shell.c 9be556ad9c7cf429d0acc48e386960d290c4df75
 -F src/sqlite.h.in e8e2d108d82647f0a812fdb74accf91c1ec08ddc
 +F src/sqlite.h.in b716539d1ab93f3027b320f2393f81cc3e0f0bf9
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
- F src/sqliteInt.h 26afd41d8d57267e8e66e30f1c109bffd519ef0c
 -F src/sqliteInt.h adbe80409c2926d91e5485789e5bf69313cd54b0
++F src/sqliteInt.h 0d51585f9517dc54cd90445443b4414644f1693a
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@@ -459,19 -455,19 +459,19 @@@ F src/update.c 1da7c462110bffed442a4288
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c e68e8ced7328f22d2cf7b4c898c394a0de34cdf1
  F src/vacuum.c 33c174b28886b2faf26e503b5a49a1c01a9b1c16
- F src/vdbe.c 3e4ca5a30ce222735803f8e2d10904770252b7f2
 -F src/vdbe.c 64c3426893e1660bde7446c242468926555e3650
++F src/vdbe.c 6521a150c69a5c30b0ec979ec4b6d6609b7cf919
  F src/vdbe.h 0c74f6305fb43b9b282dacaff102272370e327d4
  F src/vdbeInt.h 42e498dbe96475dbb3fda3d85d8fd2a87eff60a2
 -F src/vdbeapi.c ea4e2dc2213cc6bd7bee375a29a9b51c31b93ae0
 +F src/vdbeapi.c ae2cab17a15f495b461275dd3e280881eca96221
  F src/vdbeaux.c f5edc89007f8a49e224089a4a4dddbc11bd38213
  F src/vdbeblob.c f4f98ea672b242f807c08c92c7faaa79e5091b65
  F src/vdbemem.c d3fd85b7b7ef3eb75de29c6d7e1d10d3ca78b4fd
  F src/vdbesort.c bb34eed4fb52e11ac037dccea4ee3190594c7f9e
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
- F src/vtab.c e02cacb5c7ae742631edeb9ae9f53d399f093fd8
+ F src/vtab.c c4bbe0f870f52036553f8098aee0703997f0577a
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 40c543f0a2195d1b0dc88ef12142bea690009344
 -F src/wal.h 06b2a0b599cc0f53ea97f497cf8c6b758c999f71
 +F src/wal.c dad2233125cf918e8eced1ec9695525b9894cf7d
 +F src/wal.h 1598818fe90532a622ecdec5baa959f94e10062e
  F src/walker.c 91a6df7435827e41cff6bb7df50ea00934ee78b0
  F src/where.c 6bbf9284f4f15a6fa48663d033870cc0d7f5ee66
  F src/whereInt.h 2bcc3d176e6091cb8f50a30b65c006e88a73614d
@@@ -510,15 -506,15 +510,15 @@@ F test/async3.test d73a062002376d7edc1f
  F test/async4.test 1787e3952128aa10238bf39945126de7ca23685a
  F test/async5.test 383ab533fdb9f7ad228cc99ee66e1acb34cc0dc0
  F test/atof1.test ff0b0156fd705b67c506e1f2bfe9e26102bea9bd
- F test/attach.test 1e7275728d68631627ab3b81fa48d1fef22796ef
 -F test/attach.test 9976867b1a6585018f0966857aa82ed44e0bd6dc
++F test/attach.test f4ff7d463473e2fe9ea3184867961b15dcce2cc3
  F test/attach2.test 0ec5defa340363de6cd50fd595046465e9aaba2d
- F test/attach3.test 359eb65d00102cdfcef6fa4e81dc1648f8f80b27
+ F test/attach3.test c59d92791070c59272e00183b7353eeb94915976
 -F test/attach4.test 53bf502f17647c6d6c5add46dda6bac8b6f4665c
 +F test/attach4.test faaaf33fa51f986b414520cb03cecdc7999df108
  F test/attachmalloc.test 3a4bfca9545bfe906a8d2e622de10fbac5b711b0
- F test/auth.test 872a122b3977c1d1bb9fd637dc20016e5c01880f
+ F test/auth.test c6ede04bee65637ff354b43fc1235aa560c0863e
  F test/auth2.test 9eb7fce9f34bf1f50d3f366fb3e606be5a2000a1
- F test/auth3.test b810826b193831929951c0d50783a200e5ef6b72
- F test/autoinc.test c3a55c3667f429f4f4c7bed05f67b4d93e89e79d
+ F test/auth3.test 0d48b901cf111c14b4b1b5205c7d28f1a278190f
+ F test/autoinc.test 6ae8fb69c9f656962464ae4e6667045d0dfc3b46
  F test/autoindex1.test 14b63a9f1e405fe6d5bfc8c8d00249c2ebaf13ea
  F test/autoindex2.test 12ef578928102baaa0dc23ad397601a2f4ecb0df
  F test/autoindex3.test a3be0d1a53a7d2edff208a5e442312957047e972
@@@ -685,11 -681,11 +685,11 @@@ F test/exists.test 79a75323c78f02bbe9c2
  F test/expr.test 66a2c9ac34f74f036faa4092f5402c7d3162fc93
  F test/extension01.test 00d13cec817f331a687a243e0e5a2d87b0e358c9
  F test/extraquick.test cb254400bd42bfb777ff675356aabf3287978f79
 -F test/fallocate.test 3e979af17dfa7e5e9dda5eba1a696c04fa9d47f7
 +F test/fallocate.test fe52076a43ff99da8411990dbb4f374e81e88c85
  F test/filectrl.test 6e871c2d35dead1d9a88e176e8d2ca094fec6bb3
  F test/filefmt.test e4edbdc637ca9576ccf4337a3cce627d9df7a56c
- F test/fkey1.test 13e3d48236a2b9f5c5ebd232eef9b3ab682a8a2c
- F test/fkey2.test f3d27ecba480a348c328965d154214719bb158a9
+ F test/fkey1.test ba64806ff9a04eecab2679caad377ae99a5e94e4
+ F test/fkey2.test 155809016fad6b2a1491facf2ac53a551bc57c2c
  F test/fkey3.test 76d475c80b84ee7a5d062e56ccb6ea68882e2b49
  F test/fkey4.test 86446017011273aad8f9a99c1a65019e7bd9ca9d
  F test/fkey5.test 5a373303f201ac03c22ba1ef17a733d3f56e611a
@@@ -842,8 -838,8 +842,8 @@@ F test/in4.test d2b38cba404bc4320f4fe1b
  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 fab83541571c7281aa561e5ea6088eb8612a4bec
+ F test/incrblob4.test 21a52a6843a56cdcce968c6a86b72a7066d0e6ba
  F test/incrblob_err.test 69f9247fed50278d48ea710d1a8f9cdb09e4c0b8
  F test/incrblobfault.test 280474078f6da9e732cd2a215d3d854969014b6e
  F test/incrcorrupt.test 6c567fbf870aa9e91866fe52ce6f200cd548939a
@@@ -1034,10 -1029,10 +1034,10 @@@ 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 3f468a9e370a3ee8b267e58049679eb0df2b9d01
+ F test/rowvalue.test cacc565ed7e3ac467866af6705dd99020fdf2ee2
  F test/rowvalue2.test 060d238b7e5639a7c5630cb5e63e311b44efef2b
  F test/rowvalue3.test 3068f508753af69884b12125995f023da0dbb256
  F test/rowvalue4.test 4b556d7de161a0dd8cff095c336e913986398bea
@@@ -1099,9 -1094,10 +1099,10 @@@ F test/shell2.test e242a9912f44f4c23c3d
  F test/shell3.test 9b95ba643eaa228376f06a898fb410ee9b6e57c1
  F test/shell4.test 89ad573879a745974ff2df20ff97c5d6ffffbd5d
  F test/shell5.test 50a732c1c2158b1cd62cf53975ce1ea7ce6b9dc9
+ F test/shell6.test 806472f6ffdd31d632e27dbe8515c0c45f68f3ec
  F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
  F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5
 -F test/shrink.test 1b4330b1fd9e818c04726d45cb28db73087535ce
 +F test/shrink.test 09bc6e2473321e7a4711ae7d753865daffc42f4a
  F test/sidedelete.test f0ad71abe6233e3b153100f3b8d679b19a488329
  F test/skipscan1.test 8ab5d2c7c5cd3fe7f172d366e6e74e887cb33cb4
  F test/skipscan2.test d1d1450952b7275f0b0a3a981f0230532743951a
@@@ -1152,14 -1148,14 +1153,14 @@@ F test/table.test b708f3e5fa2542fa51dfa
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
  F test/tclsqlite.test 1d73b9203b1ca8798d7d7310742b8d3febc0d56e
 -F test/tempdb.test bd92eba8f20e16a9136e434e20b280794de3cdb6
 +F test/tempdb.test be87085066978807bb9eb934ae3986521e88a675
- F test/tempdb2.test 4fc92055f2a3f7626c0f2eabbb637dc021b311d5
+ F test/tempdb2.test 27e41ed540b2f9b056c2e77e9bddc1b875358507
  F test/tempfault.test 0c0d349c9a99bf5f374655742577f8712c647900
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptable2.test cd396beb41117a5302fff61767c35fa4270a0d5e
  F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
- F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
+ F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 -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
@@@ -1479,10 -1475,10 +1480,10 @@@ F tool/mkmsvcmin.tcl 2f12f7fa8858bbe61c
  F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
  F tool/mkopcodeh.tcl a01d2c1d8a6205b03fc635adf3735b4c523befd3
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
- F tool/mkpragmatab.tcl f0d5bb266d1d388cf86fce5ba01a891e95d72d41
+ F tool/mkpragmatab.tcl a30ee93515135466fc49ae881f75da07ebcafd19
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl fef88397668ae83166735c41af99d79f56afaabb
 -F tool/mksqlite3c.tcl 06b2e6a0f21cc0a5d70fbbd136b3e0a96470645e
 +F tool/mksqlite3c.tcl 8f15b936d872f576a71676b91e7dc6404b27bf66
  F tool/mksqlite3h.tcl c006c4e5da57c649b24b689511dcd270dd7b0249
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl b9e0777a213c23156b6542842c238479e496ebf5
@@@ -1541,7 -1537,8 +1542,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 41a3af5443d8c97ba75cac7f082f06b508f77c24 9675518b33e8d40769daefb860dc748113f750b6
- R 9b64f3ebcb8cab4137466b3cb5f8df97
 -P d66ec5cfb67c6c8134fb642e0c2f72113fe1b7fd 1268dc77712d85de0b62332c88b22f7489f4e87f
 -R 687c3d19b933c4e396bfa9c657e5c87e
 -T +closed 1268dc77712d85de0b62332c88b22f7489f4e87f
++P a24f805b5eb22452a22b937d372abba4426ae771 94689e3bdac2eabbcf1a51d741c2604ed4bd8a40
++R 99f9fac4dd71e5c2dfe1225bcc4121f7
  U drh
- Z 82e4d410ef156868eee9017accb6764a
 -Z fa4bf48b88eaf725bf36396e1a6dc597
++Z c3fb66a2aaa996fe285f51957b54e3c7

diff --cc manifest.uuid
index 1c2f8a316bf8931d91eefd347b4d6a816963e47d,78caff5224b9a878257152f1ec9c2bbcd42f47c5..208b17d295fae8def9f5b9479fde3cf9f661441c
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a24f805b5eb22452a22b937d372abba4426ae771
 -94689e3bdac2eabbcf1a51d741c2604ed4bd8a40
++4b1e780433fe72611b065962e419965c6644f430

diff --cc src/btree.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/pragma.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc test/attach.test
Simple merge