From: dan <Dan Kennedy>
Date: Fri, 3 Mar 2023 10:42:23 +0000 (+0000)
Subject: Remove unnecessary call to sqlite3_dbdata_init() from shell.c.in.
X-Git-Tag: version-3.42.0~297
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0b23765b6f23368a5664d879f1d65ee4631c6ce5;p=thirdparty%2Fsqlite.git

Remove unnecessary call to sqlite3_dbdata_init() from shell.c.in.

FossilOrigin-Name: c4d083a3aeeee69342d41b93a1393855871b0e4e7bfdb5fcc2973138018f248b
---

diff --git a/manifest b/manifest
index e20c907935..b42d3253ab 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\sflattening\sthe\sright\soperand\sof\sa\sLEFT\sJOIN\n(check-in\s[41c27bc0ff1d3135]),\sensure\sthat\sthe\sOP_IfNullRow\sopcode\sdoes\snot\nNULL-out\sa\ssubquery\sresult\sthat\swas\scomputed\swithin\sOP_Once.\s\sThis\sfixes\nthe\sproblem\sproblem\sreported\sby\n[forum:/forumpost/402f05296d|forum\spost\s402f05296d].
-D 2023-03-02T13:49:50.187
+C Remove\sunnecessary\scall\sto\ssqlite3_dbdata_init()\sfrom\sshell.c.in.
+D 2023-03-03T10:42:23.243
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -624,7 +624,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c d62c5665279cc7485f9d45b5e20911cc7b19c203f268321a90d05d74f4725750
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c f6224c55bc0de16b8559e80015a26f1eced7809a4a0e774efabacca98b3150f6
-F src/shell.c.in af928afa0376b2e2c962be9a0a3ab716b3983b1adfae10e248ffd40ede03b049
+F src/shell.c.in fde8844845550e7f9332132e2af57e68fe1c37090986483445c5204ee9599e59
 F src/sqlite.h.in dd0f802db5ce8b2e384cf1e04debe175b38ab5ba2c8e09f00672e8b79a1bb134
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
@@ -2048,8 +2048,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 75fdd5b83b4c527d25649b0d08841e3dc7d4d8109c1c97b2195b303538ced73d
-R 5cc223eb1f7166aa4b37bea1933f39eb
-U drh
-Z 278b20e1d47d5f647839601276b5762c
+P 8fe13f7a5e5eb798189acb25a608df7a94c2f5cc83463331a048b779c7890c82
+R d5de0af7f0990abbeebbc14d0ffe309d
+U dan
+Z eb40422026ceae79ea2f6e432eef0cbe
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f82e15b88f..704e139b27 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8fe13f7a5e5eb798189acb25a608df7a94c2f5cc83463331a048b779c7890c82
\ No newline at end of file
+c4d083a3aeeee69342d41b93a1393855871b0e4e7bfdb5fcc2973138018f248b
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index 0a54a3c5a5..c2da3dbb38 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -5325,9 +5325,6 @@ static void open_db(ShellState *p, int openFlags){
     sqlite3_fileio_init(p->db, 0, 0);
     sqlite3_completion_init(p->db, 0, 0);
 #endif
-#if SQLITE_SHELL_HAVE_RECOVER
-    sqlite3_dbdata_init(p->db, 0, 0);
-#endif
 #ifdef SQLITE_HAVE_ZLIB
     if( !p->bSafeModePersist ){
       sqlite3_zipfile_init(p->db, 0, 0);