From: stephan <stephan@noemail.net>
Date: Thu, 27 Oct 2022 11:32:20 +0000 (+0000)
Subject: Re-enable the .recovery and .dbinfo commands in shell.c.in in the fiddle build, as... 
X-Git-Tag: version-3.40.0~82
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb5136e5cbd949b0efde2b75b07ebef992a24e43;p=thirdparty%2Fsqlite.git

Re-enable the .recovery and .dbinfo commands in shell.c.in in the fiddle build, as those were fixed by [3d20d77a3511] and [cd0aa27d1732].

FossilOrigin-Name: ba3a7a4a9997f62b78467d78d95fa5b58a03ecb2e2ccb68f4d316fc08fd02f86
---

diff --git a/manifest b/manifest
index 9e692e12ba..f66cb5b964 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\suse\ssqlite3_result_text16()\sin\sthe\srecover\sextension\sif\sSQLITE_OMIT_UTF16\sis\sdefined.
-D 2022-10-27T11:25:08.538
+C Re-enable\sthe\s.recovery\sand\s.dbinfo\scommands\sin\sshell.c.in\sin\sthe\sfiddle\sbuild,\sas\sthose\swere\sfixed\sby\s[3d20d77a3511]\sand\s[cd0aa27d1732].
+D 2022-10-27T11:32:20.864
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -636,7 +636,7 @@ F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 8a709a8e19b32d2c411eaae1a10e2ee214cf740288859a9f9a362fcb2f50eaf1
-F src/shell.c.in cd16f24f755460f1168672dee4eff3d3cbf08057ef3f6fbe15b965fbd689d2f2
+F src/shell.c.in 02634e7996d087f24cb585aaec6296989e7addf306b6befc27a9a4d391262ea7
 F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 5336beea1868d99d2f62e628dbea55e97267dbff8193291ab175e960c5df9141
@@ -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 87b4cca2b84845cee603d40fbf16c9635d6dc2d19d2f37ae86abfeff716c9a85
-R 1191358d3125d3ef7c1b475e54a08f91
-U dan
-Z 95755cf8ea251206d6850b6a2278f09f
+P 3d20d77a3511bb223474da8491e1da8aec098c41c1b81ab78ff80fbd37d5b568
+R 8b1c4b146eae8a02f0a8547671d20281
+U stephan
+Z 6ccb2d2f25ac48d59b613698e33377db
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 4f6d94ef1f..dc8aca86bb 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3d20d77a3511bb223474da8491e1da8aec098c41c1b81ab78ff80fbd37d5b568
\ No newline at end of file
+ba3a7a4a9997f62b78467d78d95fa5b58a03ecb2e2ccb68f4d316fc08fd02f86
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index a400b3ec8a..6c4c3e5f72 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1057,12 +1057,7 @@ INCLUDE ../ext/misc/sqlar.c
 INCLUDE ../ext/expert/sqlite3expert.h
 INCLUDE ../ext/expert/sqlite3expert.c
 
-#if !defined(SQLITE_OMIT_VIRTUALTABLE)  \
-  && defined(SQLITE_ENABLE_DBPAGE_VTAB) \
-  && !defined(SQLITE_SHELL_FIDDLE)
-/* Including the recovery API causes the fiddle build to fail because
-** recovery-related code invokes mutex- and UTF16-related APIs which
-** we specifically disable in the wasm builds. */
+#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
 #define SQLITE_SHELL_HAVE_RECOVER 1
 #else
 #define SQLITE_SHELL_HAVE_RECOVER 0