From: larrybr <larrybr@noemail.net>
Date: Tue, 4 Apr 2023 08:49:22 +0000 (+0000)
Subject: Omit shell call to sqlite3_dbdata_init() when it is omitted.
X-Git-Tag: version-3.42.0~182
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d3651bd856f9ff0b5dee1ea499f2ab92eaa0748;p=thirdparty%2Fsqlite.git

Omit shell call to sqlite3_dbdata_init() when it is omitted.

FossilOrigin-Name: 0421cc03e0efa8f1a83e46e91f26837366c10eef0903d099e25eb0cc99c297df
---

diff --git a/manifest b/manifest
index 710c4e533f..75f9a6883e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\stranslating\sarguments\sof\saggregate\sfunctions\sinto\sreferences\sto\nexpression\sindexes,\smake\ssure\sto\sonly\stranslate\sthem\sfor\sthe\scurrent\naggregate\swhen\sthere\sare\snested\saggregates.\n[forum/forumpost/409ebc7368|Forum\spost\s409ebc7368].
-D 2023-04-03T23:49:00.977
+C Omit\sshell\scall\sto\ssqlite3_dbdata_init()\swhen\sit\sis\somitted.
+D 2023-04-04T08:49:22.005
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -626,7 +626,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 3e53e02ce87c9582bd7e7d22f13f4094a271678d9dc72820fa257a2abb5e4032
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c df007d60326a9aad94f5a4915d01e7de19d77627ed09338747a2e8e741a75add
-F src/shell.c.in 55a17c94e3e240f4d5f01eecff1f6f9bea7f8fd257e95d5ce014eef7b556a6e1
+F src/shell.c.in b3bc71c0f3259992b7279bbc5a419ab2a9678fad565ae5ec3ed07d291fc027a6
 F src/sqlite.h.in 84f0e61a07292977c31f108776e5148eb1c761e7c276de2290c1511dad7c7d3a
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
@@ -2052,8 +2052,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 050958c1828f7446e7ee7e458123a23b735e213b76a67c3dd8356da256cbc170
-R 8f74c88e7968e6ca235635bc40f218cf
-U drh
-Z 23f5beb74f4ed7eb72f5bf65796cf745
+P 898bfa1afd8260eaaf2aa6db94e74d99ebf4e8a6dc02cf21d20cd981393609a5
+R b20e56a69ad2de928705c998949ae0d5
+U larrybr
+Z c95b11a68fcbec82a06363e2fd4c58bc
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 6392ea38c8..77f96ee5e2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-898bfa1afd8260eaaf2aa6db94e74d99ebf4e8a6dc02cf21d20cd981393609a5
\ No newline at end of file
+0421cc03e0efa8f1a83e46e91f26837366c10eef0903d099e25eb0cc99c297df
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index a4bce70582..582a7594ab 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -5203,7 +5203,9 @@ static void open_db(ShellState *p, int openFlags){
     sqlite3_regexp_init(p->db, 0, 0);
     sqlite3_ieee_init(p->db, 0, 0);
     sqlite3_series_init(p->db, 0, 0);
+#ifndef SQLITE_OMIT_VIRTUALTABLE
     sqlite3_dbdata_init(p->db, 0, 0);
+#endif
 #ifndef SQLITE_SHELL_FIDDLE
     sqlite3_fileio_init(p->db, 0, 0);
     sqlite3_completion_init(p->db, 0, 0);