From: drh <>
Date: Fri, 24 Feb 2023 15:59:27 +0000 (+0000)
Subject: Back out the SQLITE_CONFIG_URI option from anytime-config.
X-Git-Tag: version-3.42.0~325^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=70e01f6adc520fadb6ad25d57eca62bc6565a2e1;p=thirdparty%2Fsqlite.git

Back out the SQLITE_CONFIG_URI option from anytime-config.

FossilOrigin-Name: 0de98b8e21e4cbf2438160651585ea23ebea952c5a4e7d88e5eabe5cc49517b2
---

diff --git a/manifest b/manifest
index 122d952ff3..b3f0b6959f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\senhancements\sfrom\strunk\sinto\sthe\sanytime-config\sbranch.
-D 2023-02-24T12:55:24.927
+C Back\sout\sthe\sSQLITE_CONFIG_URI\soption\sfrom\sanytime-config.
+D 2023-02-24T15:59:27.989
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -584,7 +584,7 @@ F src/insert.c 1b11a2e33ee52db93c02fddac67e39d00161d61b69fac2675b82f2aa68c1b61c
 F src/json.c c85ed6fce06f43d414b0d7fff64749d43a0dbd1067123ee407bd3a0752454161
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c b04eb648cedc45efe4298e1ef439ac4f0096ae27b5f01accb0a1f49d57789128
-F src/main.c 437e97a14936763b42e013f02495ef9c0bca6654073321c2bdd844cb4ec441f5
+F src/main.c cb5b7277b525ac8f7663426485332bb4f3c1fd9d07f4051980dcab806b780808
 F src/malloc.c 47b82c5daad557d9b963e3873e99c22570fb470719082c6658bf64e3012f7d23
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@ -623,7 +623,7 @@ F src/resolve.c d62c5665279cc7485f9d45b5e20911cc7b19c203f268321a90d05d74f4725750
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c a6a5cc0bbb97be616a2608cb5d063b6635b920ecd6b7b3445cde88597daf3542
 F src/shell.c.in 6f36f5ca05f1bebf74935a7fcf2dce983016e807a09cbd752a673583ad7da087
-F src/sqlite.h.in 3bdc92831511442cad4de5243b619ba8b887bb102bb464bbc5436df7e2e6568a
+F src/sqlite.h.in 5f308635ad467b50af858f271e403d14f8bcc574c2610f7cfd2d00f5bb37f616
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
 F src/sqliteInt.h cb7182dcdc9910d5f1352c90762545cc5ffb79c4a47f4ae7c5ee044fdb80423b
@@ -2046,8 +2046,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P e1702eb48d13c7c9b7605f1e77242672222c53059edcdc4e9cea59510715822a 6dea6f4738fc7d003183e94f08bd95181f23e165a966882c0bdc64708a05a607
-R ee505b1732c05f62c8c588523b4188ee
+P 04b2fdf3bc986cd402e8a6c060e1b3989e60770695e2f8a4bc12c43e380a694c
+R 4b3d5959e03f91a62bec6935bd48bd0e
 U drh
-Z 37e143e028fb2ad426a2f426402e2ea7
+Z ecaf3b30bb2b8b0cc67541076f53d55b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ae55d54044..c9b9851d30 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-04b2fdf3bc986cd402e8a6c060e1b3989e60770695e2f8a4bc12c43e380a694c
\ No newline at end of file
+0de98b8e21e4cbf2438160651585ea23ebea952c5a4e7d88e5eabe5cc49517b2
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index 4ca81a6ffb..9ec313e6fc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -437,14 +437,12 @@ int sqlite3_config(int op, ...){
   if( sqlite3GlobalConfig.isInit ){
     static const u64 mAnytimeConfigOption = 0
        | MASKBIT64( SQLITE_CONFIG_LOG )
-       | MASKBIT64( SQLITE_CONFIG_URI )
        | MASKBIT64( SQLITE_CONFIG_PCACHE_HDRSZ )
     ;
     if( op<0 || op>63 || (MASKBIT64(op) & mAnytimeConfigOption)==0 ){
       return SQLITE_MISUSE_BKPT;
     }
     testcase( op==SQLITE_CONFIG_LOG );
-    testcase( op==SQLITE_CONFIG_URI );
     testcase( op==SQLITE_CONFIG_PCACHE_HDRSZ );
   }
 
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 198e209dd8..06737e1c90 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -1793,7 +1793,6 @@ struct sqlite3_mem_methods {
 ** options is:
 ** <ul>
 ** <li> SQLITE_CONFIG_LOG
-** <li> SQLITE_CONFIG_URI
 ** <li> SQLITE_CONFIG_PCACHE_HDRSZ
 ** </ul>
 **