Merge latest trunk changes with this branch.

FossilOrigin-Name: be0df0a65fc781fde6e94c9370b4819c703d3b270c707dd59e587a2a6f36c9f4

diff --cc main.mk
Simple merge

diff --cc manifest
index 3a56cd2fb68a03f94626db21587f623875e96c0f,c7ea2677a29544caa6f977c4ae2910e2697f607e..2cae228e02868b1fc8cb6f27bd6d91a3fc1ca1a3
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Add\ssimple\stests\sfor\s"PRAGMA\sfreelist_format".
- D 2017-07-14T08:15:16.028
- F Makefile.in 081e48dfe7f995d57ce1a88ddf4d2917b4349158648a6cd45b42beae30de3a12
 -C Remove\ssome\s'breakpoint'\scommands\sin\stest\sfiles.
 -D 2017-07-19T18:01:42.362
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2017-07-19T18:54:21.843
+ F Makefile.in d9873c9925917cca9990ee24be17eb9613a668012c85a343aef7e5536ae266e8
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 4ebb1d257cac7fb1bcb4ba59278416d410ff1c4bf59447a9c37a415f3516056a
- F README.md 2b15fae33852f2f53996774c21fb41e1d94181c4401a0e43ac93e11f2cc901b9
+ F Makefile.msc 02b469e9dcd5b7ee63fc1fb05babc174260ee4cfa4e0ef2e48c3c6801567a016
+ F README.md f5c87359573c4d255425e588a56554b50fdcc2afba4e017a2e02a43701456afd
  F VERSION 87f1498f27e398bce3da2fa8125c9879a38ed9d87e4b5fb922b351de1e25cadb
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -372,7 -376,7 +376,7 @@@ F ext/userauth/userauth.c 3410be31283ab
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 168143f9b5a27c66f0c58204ce8ca231183d1c7d1d757c1fe6a25bfe214f5edc
 -F main.mk 5b7d72ab03dd70aa1401f934d31e85aefd6fc542eb58094d7a95d6921390b2d0
++F main.mk 3aa623bfdaff5fbed7a57ae1c098db55a604a7d5063f7d470e3dd2903bc95e4a
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -391,10 -395,10 +395,10 @@@ F src/auth.c 79f96c6f33bf0e5da8d1c282ce
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
- F src/btree.c 85cd6d97be767b660a030d841534b082d8e50df506c9eaaa0bcc0c5c15f77da9
 -F src/btree.c f55ea8f456d103328d61076be40fa39acbfea05eaa4eccfed275532a63c867c4
 -F src/btree.h 3edc5329bc59534d2d15b4f069a9f54b779a7e51289e98fa481ae3c0e526a5ca
++F src/btree.c d0111c10f4e8917fc9a8b0c3b7b98e1f200122682107cceb840bcbdd96da2b90
 +F src/btree.h d1f64c5683e9ade8afa968b49abeb108acd430fc33f2cae2a62a2cfc601087d8
- F src/btreeInt.h a392d353104b4add58b4a59cb185f5d5693dde832c565b77d8d4c343ed98f610
+ F src/btreeInt.h 97700795edf8a43245720414798b7b29d8e465aef46bf301ffacd431910c0da1
 -F src/build.c 74108007d286232fb4290464ee5452fa860c26215f8caa0e6c7cbf69a6fafe8f
 +F src/build.c 32107046e8cda19a917b4a397175c7eb5f2e234d19fae2fc6164859e4a3d4704
  F src/callback.c 8e14b60d1ed1c87c02cb5f121ecda99224f2aea6524a77ee6f72c9b5c7110f84
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 928954802b1397d9fb1378c7eb702c94b4735bbab1d5793e21b6a77734f56a1b
@@@ -432,36 -436,35 +436,37 @@@ F src/os.c add02933b1dce7a39a005b00a2f5
  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_unix.c d3c3a186ceb27d363f7a5e281ece4eb32b56e173a331e153a761d280034e3212
  F src/os_win.c 2a6c73eef01c51a048cc4ddccd57f981afbec18a
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 -F src/pager.c 14f6982c470c05b8e85575c69e9c1712010602e20400f8670d8699e21283e0e4
 -F src/pager.h f2a99646c5533ffe11afa43e9e0bea74054e4efa
 -F src/parse.y e384cb73f99e1b074085c974b37f4d830e885359e4b60837e30f7d67c16ba65b
 +F src/pager.c 7d0bec5dc1411cf3a5771d8608953f2eaa856dcd506c3a444060897139f7eb21
 +F src/pager.h 857d21f70acefc76e5bae4584f0133e754a2448b197d1e79b7179f26f9a11bc1
- F src/parse.y f732ca9ef4dbee9ba19d6d30d2d1f7ac0834d8642515dedbd8f6ebd16ab2a8e3
++F src/parse.y 3a1babd6645a8103898a5e7e239dcf56cdafbdc25fd8133bb4a9160f9471d42d
  F src/pcache.c 62835bed959e2914edd26afadfecce29ece0e870
  F src/pcache.h 521bb9610d38ef17a3cc9b5ddafd4546c2ea67fa3d0e464823d73c2a28d50e11
  F src/pcache1.c 1195a21fe28e223e024f900b2011e80df53793f0356a24caace4188b098540dc
- F src/pragma.c 09fe2d45a92a16d3dfcab3f18a4992b3bedaacdeed93704cc9dee4b8525717c8
- F src/pragma.h 10b1af34882f96d68b7d3bb07c00fda3283f270f83f58e1ebea6d3b694c95553
- F src/prepare.c 4b84ae7458febe1df3e04ae62ba56abc851f771340e460d14426e6802c5615f4
 -F src/pragma.c d42b6b5af353bcd763f1901accb63e07855bb8d74c81d246be12488e424e6804
 -F src/pragma.h bb83728944b42f6d409c77f5838a8edbdb0fe83046c5496ffc9602b40340a324
++F src/pragma.c 38032c10fe106e70784e67a1c120f639ae4cbba25099f705af29811c94af4065
++F src/pragma.h a59d572cbc35d210a610264a20403e209165d581bc087ceb3a75b8dc3c2553f7
+ F src/prepare.c dd250f904739b1dc449c131ac527c35e3424d94082dd111321bd83f80c6bb0fe
  F src/printf.c 8757834f1b54dae512fb25eb1acc8e94a0d15dd2290b58f2563f65973265adb2
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
- F src/resolve.c 6aa1fb1212e601f65b983ee1215d69a591986c8f97a3805c425c625a53839539
+ F src/resolve.c 4324a94573b1e29286f8121e4881db59eaedc014afeb274c8d3e07ed282e0e20
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c c9f7b7196e196e93979665680d055a789938b8e025556097bf484b184c0dd576
+ F src/select.c c6bf96a7f9d7d68f929de84738c599a30d0a725ab0b54420e70545743cd5ee7b
 +F src/server.c a5dbb0b06d046219e25f4f59998f6067e9d0761e4e06d35a70d0d7409c136c4f
 +F src/server.h a8477ae61546a9a4c8e06dd31936b06abf18bd086ae6a183ed57f721a3a194b4
- F src/shell.c a2b148e4ca8eb81b96e1050207c83d4a16ea6bf9182374faee4dd2a43628c291
- F src/sqlite.h.in 7c783bb985825a13dd4c8294aade14bc4714275e142e2a5b21fc2a618cd669fb
+ F src/shell.c dd4494287b22ac5ab0654fdd5acb1f2172d2fe621f673a39229ddc31bd8d598f
+ F src/shell.c.in b5725acacba95ccefa57b6d068f710e29ba8239c3aa704628a1902a1f729c175
 -F src/sqlite.h.in dad804d4e1979a2ddec33cc8da6aa50c04e6ba0dcb4058e7b3609588d010e041
++F src/sqlite.h.in 3f41373f19cb207d32bdb171fa051f86b779145a94fc51c4677e39c67ac3e17f
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h 58fd0676d3111d02e62e5a35992a7d3da5d3f88753acc174f2d37b774fbbdd28
- F src/sqliteInt.h 908c37c3afa8ef795159541cebe909ff52612a9bb75301841db1afd1a242e746
+ F src/sqlite3ext.h 967154985ed2ae62f90d9029bb5b5071793d847f1696a2ebe9e8cc0b042ae60b
 -F src/sqliteInt.h 0ba730cdc8afa723a5642380712f8bb33abd6a69218571c18b94acf3562de22a
++F src/sqliteInt.h 73847b09935e6d27d9b1a8f8bfa3eabba078fa7ff85b008a7d45a561c86f66b2
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
  F src/tclsqlite.c 2c29b0b76e91edfd1b43bf135c32c8674710089197327682b6b7e6af88062c3d
- F src/test1.c 1c0726cdf7389ed053a9b9aa0dc3c63f3b9bbc607a25decae6549682008510b3
+ F src/test1.c cfb78b728b37ae3a2b14fe1b3a6c766e0da41370eda112594e698c94011b622e
 -F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
 +F src/test2.c 824e16d2ff3b57dc3680a5635d049cc889492f95910368ec1ffe2ad44ca45a7f
  F src/test3.c b8434949dfb8aff8dfa082c8b592109e77844c2135ed3c492113839b6956255b
  F src/test4.c 18ec393bb4d0ad1de729f0b94da7267270f3d8e6
  F src/test5.c 328aae2c010c57a9829d255dc099d6899311672d
@@@ -511,30 -514,30 +516,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/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 874c0f2f15ab2908748297d587d22d485ea96d55aaec91d4775dddb2e24d2ecf
 -F src/vdbe.c adc8a378710ec2376101483cc8a5f499539ee9bbebfb2a784f3370704d5d44ad
 +F src/vdbe.c 51a564ddea23a62589424c7d1755dfa245a4e3ffdc3630b1dac9939cecdbbcdd
- F src/vdbe.h dde459b1e8a02b8445ecfd5959f38cd5ebb6b0ad392d491d8b159ac8193d231a
- F src/vdbeInt.h 8dd7548d86a98b77b6ed910d8014d0e9e0666356b56f3d16ab7063aad4f102f5
- F src/vdbeapi.c 899d8f021c89ab348708b3a9b00b855f5ecc3c0f949a75359a61a3c621021281
- F src/vdbeaux.c 0b78090f15b4f1a440ae73f63cf930d2a6ee672a62301b0f7e1efb87bf5eda6b
+ F src/vdbe.h 7bf719031782823b915aff2c1f93d1944c1c6b300770a15339b7dbc9610b802e
+ F src/vdbeInt.h 19bd04a4211fe56c712ab35b48be77fd5a0579b851e9dea2cb8deade359b72b9
+ F src/vdbeapi.c 52844a5a71712197be45f1c63d730c48a745c7457c959465cfb2b969af40a266
 -F src/vdbeaux.c 518d1cf6728ecb591390541c58b14902e8d61735ef574426b9971624c54d2c4b
++F src/vdbeaux.c 1fe7292ce36468a4a08e1d1ecfc8a72dede038aacce03748af755446696720c5
  F src/vdbeblob.c 359891617358deefc85bef7bcf787fa6b77facb9
- F src/vdbemem.c 8d78df62becfd2dce3c317f64b32a94ecaff8346d814bc8b0b877b38a1ad3718
+ 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 1b208938ba3c33cc419f6240d914f68a147e9abb336c578d4c153dd1579d40f8
 +F src/wal.h 739d92494eb18b6d8f3e353e66c10eb8f94534bafd336ece9f3f60235317ea08
  F src/walker.c a7ca64ce08a83a20d32186fbe06bca9234e348cfcf07959ee322fdc3e8a6173a
- F src/where.c e7cc80943459ade4ccaeb5c7c10f8a0db8b797e0b0f2509de7efc557b76bf7b6
- F src/whereInt.h 2a4b634d63ce488b46d4b0da8f2eaa8f9aeab202bc25ef76f007de5e3fba1f20
- F src/wherecode.c f17f5d51e372168db51af637e265aa5e80f99fcc81bfead96b66e71a7732bc62
- F src/whereexpr.c fa51927cc6830b9d3155cafa4e589452ec023fe313a56550d2079dca6c52fbd8
+ 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
@@@ -1083,8 -1086,8 +1088,8 @@@ F test/parser1.test 391b9bf9a229547a129
  F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
- F test/permutations.test 9e7fb13778ca3b7aa357df382fbb0933a90980223f25b3fc9db964e33ff2aaa2
- F test/pragma.test 1e94755164a3a3264cd39836de4bebcb7809e5f8
 -F test/permutations.test 5e2e5439642898e0947ced066ad09b82bd817ddfb83dc71291b4c957efc84b62
++F test/permutations.test 7340e77a5c5ed4f0d29f8c650e53ed642d19c1622b894b15e0e31167033e4354
+ F test/pragma.test f274259d6393b6681eb433beb8dd39a26ec06a4431052a4880b43b84912a3f58
  F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
  F test/pragma3.test 14c12bc5352b1e100e0b6b44f371053a81ccf8ed
  F test/pragma4.test 6e85b6eab8e61ffc9c7db59d842276674e8e3264
@@@ -1569,15 -1568,16 +1576,16 @@@ F tool/logest.c 11346aa019e2e77a00902aa
  F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439
  F tool/mkautoconfamal.sh e855df211ecbcc7131dee817110ff386cfb112f7
  F tool/mkctimec.tcl dd183b73ae1c28249669741c250525f0407e579a70482371668fd5f130d9feb3
 -F tool/mkkeywordhash.c 2e852ac0dfdc5af18886dc1ce7e9676d11714ae3df0a282dc7d90b3a0fe2033c
 +F tool/mkkeywordhash.c 969c50301da61d73c4c6d0661c1d1abc6c25ba35f1212832d0b12965f90505ab
  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 983057a16468b7e5f7c8a1a0f9ba515b4e188d04f326b781ea96c2cf814b3b9f
 -F tool/mkpragmatab.tcl 2144bc8550a6471a029db262a132d2df4b9e0db61b90398bf64f5b7b3f8d92cd
++F tool/mkpragmatab.tcl c249dee507fc499d43072b14eb8b0373204dca952e770b9b9924c211bca0169a
+ F tool/mkshellc.tcl 69c38ecd7b74b2b0799a35ce20e1e3998e504d8c99c100ca4b98ae9d8f6279bc
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl fef88397668ae83166735c41af99d79f56afaabb
 -F tool/mksqlite3c.tcl f6214285bec900d28441366ca31af327aade18bbc424b0480497966ec05bc43c
 +F tool/mksqlite3c.tcl 4b17864d0ae7664b2a82ac852afbe52e7d1db65c996b72941e149704b5e3cc15
  F tool/mksqlite3h.tcl 51bd5e7e840a920388a5966c9f2ccc618f434c57bd68c1bab4085b2553e1e237
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl b9e0777a213c23156b6542842c238479e496ebf5
@@@ -1637,7 -1636,7 +1645,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 dcc407972aa213d28f95cbaf4da5ab7d89ddbad2740f41cfb44b2c2ce20a3132
- R 926f2f82f6c2fb1cbb14a30d94f3fd06
 -P c93284cd65b6471bffc38696e14dc24a2170698faf566cf91b727ba272f88c25
 -R 9a0e35c22d772f08ad350059e0e65c0d
 -U mistachkin
 -Z 3b6354332c6aa6dc358fe07c8de8d63d
++P 98a36f4cf127ceec423952a3d80d8d22163f128a5e6290cf6144c59029332944 d14fc621e918915bbf8e04597eb238ea78dff3d9c5eb4402cb88692d00dbdfee
++R 12fce594a984131f0e3459cd80c5ba97
 +U dan
- Z ed40a5c4613b127b71d738176ea73d52
++Z 7453e44f0ff2284a15fd0e8ee0880d92

diff --cc manifest.uuid
index 00acc9c7abd350b68c70ae311113ae6fb34cc524,ce0522a734f1434f007846375c31b79e8a826c95..bdad93087a684566c1e0bd25bd6cb510ee5da235
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 98a36f4cf127ceec423952a3d80d8d22163f128a5e6290cf6144c59029332944
 -d14fc621e918915bbf8e04597eb238ea78dff3d9c5eb4402cb88692d00dbdfee
++be0df0a65fc781fde6e94c9370b4819c703d3b270c707dd59e587a2a6f36c9f4

diff --cc src/btree.c
Simple merge

diff --cc src/parse.y
Simple merge

diff --cc src/pragma.c
Simple merge

diff --cc src/pragma.h
index a21b70aacef592fd10ef70d74bdb0b4b3d8edd1c,c9ece2dc875f8232c6c30a8b788c1dbc0507f7dd..a99165871db08138ffcd7f2b798b098d85b9f6a8
--- 1/src/pragma.h
--- 2/src/pragma.h
+++ b/src/pragma.h
@@@ -20,36 -20,38 +20,39 @@@
  #define PragTyp_ENCODING                      12
  #define PragTyp_FOREIGN_KEY_CHECK             13
  #define PragTyp_FOREIGN_KEY_LIST              14
 -#define PragTyp_FUNCTION_LIST                 15
 -#define PragTyp_INCREMENTAL_VACUUM            16
 -#define PragTyp_INDEX_INFO                    17
 -#define PragTyp_INDEX_LIST                    18
 -#define PragTyp_INTEGRITY_CHECK               19
 -#define PragTyp_JOURNAL_MODE                  20
 -#define PragTyp_JOURNAL_SIZE_LIMIT            21
 -#define PragTyp_LOCK_PROXY_FILE               22
 -#define PragTyp_LOCKING_MODE                  23
 -#define PragTyp_PAGE_COUNT                    24
 -#define PragTyp_MMAP_SIZE                     25
 -#define PragTyp_MODULE_LIST                   26
 -#define PragTyp_OPTIMIZE                      27
 -#define PragTyp_PAGE_SIZE                     28
 -#define PragTyp_PRAGMA_LIST                   29
 -#define PragTyp_SECURE_DELETE                 30
 -#define PragTyp_SHRINK_MEMORY                 31
 -#define PragTyp_SOFT_HEAP_LIMIT               32
 -#define PragTyp_SYNCHRONOUS                   33
 -#define PragTyp_TABLE_INFO                    34
 -#define PragTyp_TEMP_STORE                    35
 -#define PragTyp_TEMP_STORE_DIRECTORY          36
 -#define PragTyp_THREADS                       37
 -#define PragTyp_WAL_AUTOCHECKPOINT            38
 -#define PragTyp_WAL_CHECKPOINT                39
 -#define PragTyp_ACTIVATE_EXTENSIONS           40
 -#define PragTyp_HEXKEY                        41
 -#define PragTyp_KEY                           42
 -#define PragTyp_REKEY                         43
 -#define PragTyp_LOCK_STATUS                   44
 -#define PragTyp_PARSER_TRACE                  45
 -#define PragTyp_STATS                         46
 +#define PragTyp_FREELIST_FORMAT               15
- #define PragTyp_INCREMENTAL_VACUUM            16
- #define PragTyp_INDEX_INFO                    17
- #define PragTyp_INDEX_LIST                    18
- #define PragTyp_INTEGRITY_CHECK               19
- #define PragTyp_JOURNAL_MODE                  20
- #define PragTyp_JOURNAL_SIZE_LIMIT            21
- #define PragTyp_LOCK_PROXY_FILE               22
- #define PragTyp_LOCKING_MODE                  23
- #define PragTyp_PAGE_COUNT                    24
- #define PragTyp_MMAP_SIZE                     25
- #define PragTyp_OPTIMIZE                      26
- #define PragTyp_PAGE_SIZE                     27
- #define PragTyp_SECURE_DELETE                 28
- #define PragTyp_SHRINK_MEMORY                 29
- #define PragTyp_SOFT_HEAP_LIMIT               30
- #define PragTyp_SYNCHRONOUS                   31
- #define PragTyp_TABLE_INFO                    32
- #define PragTyp_TEMP_STORE                    33
- #define PragTyp_TEMP_STORE_DIRECTORY          34
- #define PragTyp_THREADS                       35
- #define PragTyp_WAL_AUTOCHECKPOINT            36
- #define PragTyp_WAL_CHECKPOINT                37
- #define PragTyp_ACTIVATE_EXTENSIONS           38
- #define PragTyp_HEXKEY                        39
- #define PragTyp_KEY                           40
- #define PragTyp_REKEY                         41
- #define PragTyp_LOCK_STATUS                   42
- #define PragTyp_PARSER_TRACE                  43
- #define PragTyp_STATS                         44
++#define PragTyp_FUNCTION_LIST                 16
++#define PragTyp_INCREMENTAL_VACUUM            17
++#define PragTyp_INDEX_INFO                    18
++#define PragTyp_INDEX_LIST                    19
++#define PragTyp_INTEGRITY_CHECK               20
++#define PragTyp_JOURNAL_MODE                  21
++#define PragTyp_JOURNAL_SIZE_LIMIT            22
++#define PragTyp_LOCK_PROXY_FILE               23
++#define PragTyp_LOCKING_MODE                  24
++#define PragTyp_PAGE_COUNT                    25
++#define PragTyp_MMAP_SIZE                     26
++#define PragTyp_MODULE_LIST                   27
++#define PragTyp_OPTIMIZE                      28
++#define PragTyp_PAGE_SIZE                     29
++#define PragTyp_PRAGMA_LIST                   30
++#define PragTyp_SECURE_DELETE                 31
++#define PragTyp_SHRINK_MEMORY                 32
++#define PragTyp_SOFT_HEAP_LIMIT               33
++#define PragTyp_SYNCHRONOUS                   34
++#define PragTyp_TABLE_INFO                    35
++#define PragTyp_TEMP_STORE                    36
++#define PragTyp_TEMP_STORE_DIRECTORY          37
++#define PragTyp_THREADS                       38
++#define PragTyp_WAL_AUTOCHECKPOINT            39
++#define PragTyp_WAL_CHECKPOINT                40
++#define PragTyp_ACTIVATE_EXTENSIONS           41
++#define PragTyp_HEXKEY                        42
++#define PragTyp_KEY                           43
++#define PragTyp_REKEY                         44
++#define PragTyp_LOCK_STATUS                   45
++#define PragTyp_PARSER_TRACE                  46
++#define PragTyp_STATS                         47
  
  /* Property flags associated with various pragma. */
  #define PragFlg_NeedSchema 0x01 /* Force schema load before running */
@@@ -621,4 -646,4 +654,4 @@@ static const PragmaName aPragmaName[] 
    /* iArg:      */ SQLITE_WriteSchema },
  #endif
  };
- /* Number of pragmas: 60 on by default, 75 total. */
 -/* Number of pragmas: 60 on by default, 77 total. */
++/* Number of pragmas: 60 on by default, 78 total. */

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc test/permutations.test
Simple merge

diff --cc tool/mkpragmatab.tcl
Simple merge