Bring the hard-heap-limit branch up-to-date with trunk.

FossilOrigin-Name: 9b14eb77548d3f65f5a4c9b16cecdbce8a3fb663692aa8315fbd21aab3e89f0d

diff --cc manifest
index 04c0aa028c45f98e0fce503875854d347d3faaf7,f7957a23fb13622a5f177237e7ca795698c35034..962b0734d47bc2482ede47d99bb7f146fab23b83
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\senhancements\sfrom\strunk
- D 2019-05-02T14:15:12.561
 -C Fix\sa\ssegfault\sthat\scould\soccur\sfollowing\san\sOOM\swhile\sprocessing\sa\sSELECT\sstatement\sfor\swhich\sone\sor\smore\sof\sthe\sexpressions\sin\sthe\swindow\sframe\sdeclaration\sare\sthemselves\ssub-selects\sthat\suse\swindow\sfunctions.
 -D 2019-08-20T14:43:01.572
++C Bring\sthe\shard-heap-limit\sbranch\sup-to-date\swith\strunk.
++D 2019-08-20T17:14:21.963
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -480,11 -484,11 +484,11 @@@ F src/hash.c 8d7dda241d0ebdafb6ffdeda31
  F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c fc3cf5c371f9a400144e8c2f148ab29cd3f67f7da7eaf47e6a6959f8255fd92c
+ F src/insert.c c2194dd2886337b870226fcb31c13e7df8c4b5e0ea85140e510a6f1daf1ad65b
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
- F src/loadext.c 4b9eecde583534775c178eb42a83cff530c99c20745ca57ec940b60b79824382
- F src/main.c 16eea1ab004331312da0538dafb497cc0ed82fd9bb2e67f7684b40bf2797b666
 -F src/loadext.c a045bb3425a9a633cc0f78e93d9beda6866f4c0f15bfdee735aba7c6b39f5cc4
++F src/loadext.c de2db4516f5a0a6a8f10e56857bec0e3722854384fbc5c2e45ce016a96ab4ccf
+ F src/main.c 51c55eb579eac4180bfcc6242741084710911350d2cd0c3fdd0f9fde55442128
 -F src/malloc.c 0f9da2a66b230a5785af94b9672126845099b57b70a32c987d04ac28c69da990
 +F src/malloc.c 224052e6747deb46e4daf47b9aea4af612715c2907722e44483119fef8d2a0c1
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@@ -508,28 -512,28 +512,28 @@@ F src/os_win.c 035a813cbd17f355bdcad7ab
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
  F src/pager.c 422fd8cfa59fb9173eff36a95878904a0eeb0dcc62ba49350acc8b1e51c4dc7b
  F src/pager.h 217921e81eb5fe455caa5cda96061959706bcdd29ddb57166198645ef7822ac3
- F src/parse.y 22f64d8a8910acd17580450513b58d64187b0962848380c7f0a39376b8a48cee
- F src/pcache.c 696a01f1a6370c1b50a09c15972bc3bee3333f8fcd1f2da8e9a76b1b062c59ee
+ F src/parse.y 6d03a24bc0dcd15b93c480ea8a87f7ccd25313fe826485726d9ef13b82f2378d
+ F src/pcache.c 385ff064bca69789d199a98e2169445dc16e4291fa807babd61d4890c3b34177
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
- F src/pcache1.c be64b2f3908a7f97c56c963676eb12f0d6254c95b28cdc1d73a186eff213219d
- F src/pragma.c f3efbe2f567b8ac73dd3c09ca7055c590a6ee3a3b7263d654bf26f338286b11a
- F src/pragma.h 9af5ddde96902a3f318e0100feea3a455a6f87cd9930c9183773f1e362055070
- F src/prepare.c 78027c6231fbb19ca186a5f5f0c0a1375d9c2cec0655273f9bd90d9ff74a34b3
- F src/printf.c 67f79227273a9009d86a017619717c3f554f50b371294526da59faa6014ed2cd
+ F src/pcache1.c 62714cbd1b7299a6e6a27a587b66b4fd3a836a84e1181e7f96f5c34a50917848
 -F src/pragma.c b47bc7db02ab13d04c680aee424466b4e34f4ef5aa7b2e464876ec005806f98f
 -F src/pragma.h 40962d65b645bb3f08c1f4c456effd01c6e7f073f68ea25177e0c95e181cff75
++F src/pragma.c e423ea296f594cf6264cde3d3b9ce626dcef9d98a412488ed9564e1d62b8d312
++F src/pragma.h ef66a7db7a1df2c165ec7263f0375bbb47219af58eefa3b90244de696c703a08
+ F src/prepare.c 132484635a30f873ee7eccd47f93ed1932503863b93b28423b42332d81adffaf
+ F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
- F src/resolve.c 408632d9531ca8f1df8591f00530797daaa7bde3fe0d3211de4d431cbb99347e
+ F src/resolve.c b2733d39a22f5023ab489b8535ca6854b51ff8667ca975815d004bb7388b0e41
  F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
- F src/select.c b7304d2f491c11a03a7fbdf34bc218282ac54052377809d4dc3b4b1e7f4bfc93
- F src/shell.c.in 567236da9ee68b1dfa363426858ee5e310976ffe422a7b7ae220c0315d7e8c53
- F src/sqlite.h.in 7593b6df09ca8f4b9f22005a2164413704e5a4e7cb82697efae4315c8e12e0a3
+ F src/select.c 80b8b4c857db2f20d98f80b71ef3bb0d70cdd17bd6b00217dcff803e9b989bd8
+ F src/shell.c.in e0f0758b6ab506d8ab12502fd2b8c55546bb9e4bb772374344a5a1b73f5bc2b9
 -F src/sqlite.h.in 50fc0914ccd347437db9a0278a47d7541df3a45eb6e641e9680750c6f98dad27
++F src/sqlite.h.in 28429eea13de6fdce4d2cb03364faa58efe08f2f1cddd644548beb2b26d0efa4
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h aa8c3f601d8a6e8efdc485e4bbfd6cdbb18ac4e53b1a71329a07f2d6ded6b1c5
- F src/sqliteInt.h 866311ac436c0c2039fccc7ea976fbc79d40c1c2ea687161fa4ba64379b53ae6
 -F src/sqlite3ext.h cef696ce3293242c67b2339763608427bf72ee66f1f3a05389ac2a7b46001c31
++F src/sqlite3ext.h 72af51aa4e912e14cd495fb6e7fac65f0940db80ed950d90911aff292cc47ce2
+ F src/sqliteInt.h b7d612d9c63abc8a8a7dcf7fbec5326b1770f40c81502c56f508e272154e7615
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
- F src/tclsqlite.c cfe7f93daf9d8787f65e099efb67d7cdfc2c35236dec5d3f6758520bd3519424
- F src/test1.c 983ad8bf1c36b4620ae038d22a12bffefad98d9ea5a327e96de03f3b82d3d997
+ F src/tclsqlite.c 50c93be3e1c03b4e6cf6756e5197afcfe7f5cd0497d83a7ac317cde09e19b290
 -F src/test1.c 8ce455da8dcec886a0e1e608da0fee7de67c8195b14517a8824a2a40c2d11fbf
++F src/test1.c be546df3c0cd2fd49bea85aea21a863855800a7f51d5a6663340be4bc95c04f2
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
  F src/test4.c 405834f6a93ec395cc4c9bb8ecebf7c3d8079e7ca16ae65e82d01afd229694bb
@@@ -584,34 -588,34 +588,34 @@@ F src/test_window.c cdae419fdcea5bad6dc
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
  F src/tokenize.c d3615f0cbe4db5949503bf5916f3cd4fa5de855d5b4ef560f3b6dd5629423a1e
- F src/treeview.c 47762086f3cfd2e973bd1a852b154202d1cc32380cc073f49789b2bdf461785d
- F src/trigger.c bb034c08eca111e66a19cda045903a12547c1be2294b5570d794b869d9c44a73
- F src/update.c 0b973357d88092140531e07ff641139c26fb4380b0b9f5ed98c5f7691b4604d1
 -F src/treeview.c fc8c6c0a8a26afb3a97e3f844d65403dd27cf1450baf4415034fa4ccf00c4d7e
++F src/treeview.c 72b78e17fd7ceaf7bf6ac23ea1c9c0a716aafede61adc20b791b4374bab77f5a
+ F src/trigger.c 2305271878e95addc1c01361e5e8e342e87cba5efefdd7d3032687e5d67e05d1
+ F src/update.c 3cb9150d2cf661d938e2f1b1749945f3faa767f88febdb739ab1793bbf895ff2
  F src/upsert.c 0dd81b40206841814d46942a7337786932475f085716042d0cb2fc7791bf8ca4
  F src/utf.c 2f0fac345c7660d5c5bd3df9e9d8d33d4c27f366bcfb09e07443064d751a0507
- F src/util.c 5061987401c2e8003177fa30d73196aa036727c8f04bf36a2df0c82b1904a236
+ F src/util.c fffdfa627be74d69ef425f92db124e7148af449bb8a3286e79577c42bca84061
  F src/vacuum.c 82dcec9e7b1afa980288718ad11bc499651c722d7b9f32933c4d694d91cb6ebf
- F src/vdbe.c 36993059b87e7c2adf671aaa4ef5e0f826b6f4d95be15b019aee14308f0047b5
- F src/vdbe.h 712bca562eaed1c25506b9faf9680bdc75fc42e2f4a1cd518d883fa79c7a4237
- F src/vdbeInt.h 0e2c44958fb42d90a4eacb122d77e2d5b89b82f5e2b4b047b422962dc0346357
- F src/vdbeapi.c 2ddd60f4a351f15ee98d841e346af16111ad59dfa4d25d2dd4012e9875bf7d92
- F src/vdbeaux.c f873b5c2efcf8a4d6ecfc5b1a5b06fd810419198f3bd882175d371cc03801873
- F src/vdbeblob.c f5c70f973ea3a9e915d1693278a5f890dc78594300cf4d54e64f2b0917c94191
- F src/vdbemem.c df36fd36c7585e42869f3a44f5da5dc70e13306bc97ba52eebe069e174ba55db
- F src/vdbesort.c 66592d478dbb46f19aed0b42222325eadb84deb40a90eebe25c6e7c1d8468f47
- F src/vdbetrace.c 79d6dbbc479267b255a7de8080eee6e729928a0ef93ed9b0bfa5618875b48392
- F src/vtab.c 1fa256c6ddad7a81e2a4dc080d015d4b0a7135767717d311298e47f6fca64bb3
+ F src/vdbe.c 1041610254502572bcc79ce6f61d9364fb93c154a4935fbaeaa7fd2e158e5205
+ F src/vdbe.h 3f2b571e702e77e6bf031f0236e554aedfae643e991f69000320f481408455cf
+ F src/vdbeInt.h e95de5129124d77f01439e6635012adfaf23c0017bff47296126143cf18bd0c6
+ F src/vdbeapi.c 95001d0f84ee3cda344fed98ca0d7961deb4fc836b83495630d0af1f7cc4789e
+ F src/vdbeaux.c 8eeb9799d80bc6b37f2bcb23b3519234b596c530046c2cd0261f9ef1a1ba6c37
+ F src/vdbeblob.c 253ed82894924c362a7fa3079551d3554cd1cdace39aa833da77d3bc67e7c1b1
+ F src/vdbemem.c 920285c3b7f5c64369e02da437dab71e9e91862df9c486541c14633739f91d75
+ F src/vdbesort.c 3531ae3a431ad6b98b67bd891fb42ec9d66867157188a2b1a9e58c55da6151b2
+ F src/vdbetrace.c fa3bf238002f0bbbdfb66cc8afb0cea284ff9f148d6439bc1f6f2b4c3b7143f0
+ F src/vtab.c 5a0b7193d586991b3db30e343d6b59959906bfe8658a6a0a85709b20ca50bb49
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
- F src/wal.c b09a2a9cab50efa08451a8c81d47052120ad5da174048c6d0b08d405384abdf2
+ F src/wal.c bbd6838bd79c0a32144d482fb0b6a9d2d1a252fb3b16d5005ec30f2f80413b0d
  F src/wal.h 606292549f5a7be50b6227bd685fa76e3a4affad71bb8ac5ce4cb5c79f6a176a
- F src/walker.c 7607f1a68130c028255d8d56094ea602fc402c79e1e35a46e6282849d90d5fe4
- F src/where.c 99c7b718ef846ac952016083aaf4e22ede2290beceaf4730a2df55c023251369
- F src/whereInt.h 5f14db426ca46a83eabab1ae9aa6d4b8f27504ad35b64c290916289b1ddb2e88
- F src/wherecode.c 0e76672930bea322eb3606d891a4744be55c09bcd3a995bfd501af62a46e0625
- F src/whereexpr.c 7fedf990999722dafda5ab8040feac93937a6f95f4671d8d629f2baf014b4b80
- F src/window.c 038c248267e74ff70a2bb9b1884d40fd145c5183b017823ecb6cbb14bc781478
+ F src/walker.c d5a94907dcac990e31976be9dc769d17f6a806782593d6aec9d760ee01ec22cd
+ F src/where.c 2fac51d2420f05ab6f644f1813d4f73f6214304836fd9b22345738d943faad9b
+ F src/whereInt.h 2082fc2bd1eb66cb236a1a3c4b250e33d2bad9e43a0486a2cf9e4e211c58f3eb
+ F src/wherecode.c e1131fe94c8728cbecc707f6455afbda9418896497bdca2d49a04ce6c57999f6
+ F src/whereexpr.c 5cce1fd11876086890a27c05e0cb75ca97ba64ba6984f72154039f1cfd2e69cc
+ F src/window.c 07e1c15081a735750218185c6b17053c87ecb764d06ab2c0a1ce568a2b4688e5
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
- F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
+ F test/affinity2.test 34f2cf88e2a08d7a54a1fa2c9773ba81bf8b8216c0895e476118a1285540ee71
  F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test 18b00de006597e960a6b27ccec51474ac66cf1070a87c1933e5694dc02190ef1
@@@ -1755,7 -1769,7 +1769,7 @@@ F tool/mkmsvcmin.tcl cad0c7b54d7dd92bc8
  F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
  F tool/mkopcodeh.tcl 352a4319c0ad869eb26442bf7c3b015aa15594c21f1cce5a6420dbe999367c21
  F tool/mkopts.tcl 680f785fdb09729fd9ac50632413da4eadbdf9071535e3f26d03795828ab07fa
- F tool/mkpragmatab.tcl 0b0d2500ca37ae0f21abe19440ecc1abcde64e8ccc955f670ac69098beaf0b0d
 -F tool/mkpragmatab.tcl f115d63ada8171f9da28dc8e34e043a1a159692d46b89f66b6e681140bc4683d
++F tool/mkpragmatab.tcl 3ee0d8cfbf78c5b427709ce94cbb9aa5c8d4a678522e981a082e30c19d2dffab
  F tool/mkshellc.tcl 70a9978e363b0f3280ca9ce1c46d72563ff479c1930a12a7375e3881b7325712
  F tool/mksourceid.c d458f9004c837bee87a6382228ac20d3eae3c49ea3b0a5aace936f8b60748d3b
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
@@@ -1822,7 -1836,7 +1836,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 b0ccef61a7f92d20228becbf4f997bf0f4e46dad2deaf0896dc63b976ad1dd11 b043a54c3de54b286c4eae564eab6b99118a410d99bdb63480faba3123d2ca11
- R a89d7e67760240a4adc746cc054ccd07
 -P 658bd51623787be4ca87b066a051d119f39056286e223afef3691629cf1ab0e1
 -R de5c373fa0aa9adc1be1e5804cb9b91d
 -U dan
 -Z d06c51f62e0fa708481e21348393bcb2
++P 3a4751a9f2784131f81071305b838caa63410a76533fb879627e1849d626f893 75aec4fc886c04fe098828cc03bc72c197cbf40f0a1890fe5bbb98d4fd5c3c7e
++R c7c33fc0cf57bfd645b58e89a6e2b6fd
 +U drh
- Z 04e5ccc16cb84aeda9f5596141eed90d
++Z ec606df4fceac7b5710831077f6b5b02

diff --cc manifest.uuid
index 3261ee26a02667a58b1a0dcaba1ac48da947f090,e37939af6d820c7a65aae0449749647826c35e6a..82b956e69998045dad0f71806c56ebe94b9a359a
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3a4751a9f2784131f81071305b838caa63410a76533fb879627e1849d626f893
 -75aec4fc886c04fe098828cc03bc72c197cbf40f0a1890fe5bbb98d4fd5c3c7e
++9b14eb77548d3f65f5a4c9b16cecdbce8a3fb663692aa8315fbd21aab3e89f0d

diff --cc src/loadext.c
index 47c21d4e952a2a4de56be47969770db78d85f994,03997c0275c1a3de6cd62297900da84146866eff..30c471372fdb6bde90a60cd6213b8ef6ca8dd1df
--- 1/src/loadext.c
--- 2/src/loadext.c
+++ b/src/loadext.c
@@@ -462,8 -462,8 +462,9 @@@ static const sqlite3_api_routines sqlit
    /* Version 3.28.0 and later */
    sqlite3_stmt_isexplain,
    sqlite3_value_frombind,
-   /* Version 3.29.0 and later */
+   /* Version 3.30.0 and later */
+   sqlite3_drop_modules,
 +  sqlite3_hard_heap_limit64
  };
  
  /*

diff --cc src/pragma.c
Simple merge

diff --cc src/pragma.h
index 4e03fee65dfb0762eae79a84e30559b5441c160d,b7f3282ded6b43d64435a38bbb3b9f9b4114057c..8a019bda303505dcf24f235238616a4970881e5a
--- 1/src/pragma.h
--- 2/src/pragma.h
+++ b/src/pragma.h
@@@ -21,36 -21,34 +21,35 @@@
  #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_KEY                           41
 -#define PragTyp_LOCK_STATUS                   42
 -#define PragTyp_STATS                         43
 +#define PragTyp_HARD_HEAP_LIMIT               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_LOCK_STATUS                   44
- #define PragTyp_STATS                         45
++#define PragTyp_KEY                           42
++#define PragTyp_LOCK_STATUS                   43
++#define PragTyp_STATS                         44
  
  /* Property flags associated with various pragma. */
  #define PragFlg_NeedSchema 0x01 /* Force schema load before running */
@@@ -319,14 -319,9 +320,14 @@@ static const PragmaName aPragmaName[] 
    /* iArg:      */ 0 },
  #endif
  #endif
 + {/* zName:     */ "hard_heap_limit",
 +  /* ePragTyp:  */ PragTyp_HARD_HEAP_LIMIT,
 +  /* ePragFlg:  */ PragFlg_Result0,
 +  /* ColNames:  */ 0, 0,
 +  /* iArg:      */ 0 },
  #if defined(SQLITE_HAS_CODEC)
   {/* zName:     */ "hexkey",
-   /* ePragTyp:  */ PragTyp_HEXKEY,
+   /* ePragTyp:  */ PragTyp_KEY,
    /* ePragFlg:  */ 0,
    /* ColNames:  */ 0, 0,
    /* iArg:      */ 2 },
@@@ -673,4 -668,4 +674,4 @@@
    /* iArg:      */ SQLITE_WriteSchema|SQLITE_NoSchemaError },
  #endif
  };
- /* Number of pragmas: 63 on by default, 82 total. */
 -/* Number of pragmas: 65 on by default, 81 total. */
++/* Number of pragmas: 66 on by default, 82 total. */

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

diff --cc src/sqlite3ext.h
index e750b90e2301a1760c6fa033eb86186d62d7c2da,416ac94231a3a65f3aef1e4e7ee635327aa73945..f7a0386a7a8207e43b3ed2520e4dfbb622f47a96
--- 1/src/sqlite3ext.h
--- 2/src/sqlite3ext.h
+++ b/src/sqlite3ext.h
@@@ -322,8 -322,8 +322,9 @@@ struct sqlite3_api_routines 
    /* Version 3.28.0 and later */
    int (*stmt_isexplain)(sqlite3_stmt*);
    int (*value_frombind)(sqlite3_value*);
-   /* Version 3.29.0 and later */
+   /* Version 3.30.0 and later */
+   int (*drop_modules)(sqlite3*,const char**);
 +  sqlite3_int64 (*hard_heap_limit64)(sqlite3_int64);
  };
  
  /*
@@@ -616,8 -616,8 +617,9 @@@ typedef int (*sqlite3_loadext_entry)
  /* Version 3.28.0 and later */
  #define sqlite3_stmt_isexplain         sqlite3_api->isexplain
  #define sqlite3_value_frombind         sqlite3_api->frombind
- /* Version 3.29.0 and later */
+ /* Version 3.30.0 and later */
+ #define sqlite3_drop_modules           sqlite3_api->drop_modules
 +#define sqlite3_hard_heap_limit64      sqlite3_api->hard_heap_limit64
  #endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
  
  #if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)

diff --cc src/test1.c
Simple merge

diff --cc src/treeview.c
Simple merge

diff --cc tool/mkpragmatab.tcl
Simple merge