Implement check-in [477577120b897bf1] differently, so as not to disrupt

non-standard build configuration. See
[forum:/forumpost/c11523ca2df50293|forum post c11523ca2df50293].

FossilOrigin-Name: 50448fe4fdc8fd93303fe26bdcd885ecc606080c8e66e69d5be8dac28a77492b

diff --git a/manifest b/manifest
index 9af5eb1bf62cd5c759b2b7bd639c794a58cc6924..b9774f5769c3940224c17c9cc193a504bc69bdf5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Test\scases\sfor\sCOLLATE\sand\sNULLS\sFIRST/LAST\sin\sthe\sORDER\sBY\sfor\san\naggregate\sfunction.
-D 2023-10-24T17:45:11.642
+C Implement\scheck-in\s[477577120b897bf1]\sdifferently,\sso\sas\snot\sto\sdisrupt\nnon-standard\sbuild\sconfiguration.\sSee\n[forum:/forumpost/c11523ca2df50293|forum\spost\sc11523ca2df50293].
+D 2023-10-24T19:56:57.182
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -722,7 +722,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 31229276a8eb5b5de1428cd2d80f6f1cf8ffc5248be25e47cf575df12f1b8f23
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c f9d8ece7f0742d7b835efa9590ccda4eccee5b9def7581ec94f556e3c52efe51
-F src/shell.c.in 66995332610ed7d47483152c4c78810519ca9ac8b2f93ee884127ce330ca12e8
+F src/shell.c.in acc452c414fddd10289d165be3c89a7a2c36c919def04c93fb7dd11ac022e6ed
 F src/sqlite.h.in e9047d63745272ebe5c91bf994f9bbc608edfbc3b0be9873062e9a69657bf984
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 2f30b2671f4c03cd27a43f039e11251391066c97d11385f5f963bb40b03038ac
@@ -2138,8 +2138,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 688c6279ef1d4ff8d58e83a1c73ca0221ab8570a7cd89459946a86afdad6ec1c
-R 3064fd7ebff205f56ff9b901509432de
+P 641f928feb8b6cfd64cb03992bc18c1653960b6eaeb35145d17df494727c7a11
+R 07cab3cfe441872ad8db93a7e61dc6f3
 U drh
-Z 43199bfadf9e01e03c769a5bbfeebed2
+Z 7ea3a838c923da816dd181b561116bed
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index bcf1742392178240ec9fd623937ff27c6c8d3413..b418b289bf841b112b0873fbba5c166cfe97d4d9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-641f928feb8b6cfd64cb03992bc18c1653960b6eaeb35145d17df494727c7a11
\ No newline at end of file
+50448fe4fdc8fd93303fe26bdcd885ecc606080c8e66e69d5be8dac28a77492b
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 50f78acca8fa116cf5e2c5f195ef20b463f39757..b78759c002389f14dce125cada065939f7a58986 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -454,6 +454,7 @@ static int stdin_is_interactive = 1;
 # define SHELL_WIN_UTF8_OPT 1
   static int console_utf8 = sizeof(char*)/4 - 1;
 #else
+# define console_utf8 0
 # define SHELL_WIN_UTF8_OPT 0
 #endif