Do not use integer constants like 100_000 in the shell code on this branch. They...

FossilOrigin-Name: 8362edb45b993f8467b464ca0491ef347c8215ea2e65504f7b3d1f7232eb3c63

diff --git a/manifest b/manifest
index eb911dfe9ab42281c19f47a40f17a2fa1db29b5c..0bc760ecabca59759d9c72960a9a519b641adf2c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sthe\soutput\sof\s".scanstats\svm"\sto\sinclude\sthe\sabsolute\snumber\sof\sticks\sfor\seach\sVM\sinstruction,\sinstead\sof\sjust\sthe\spercentage\sof\sthe\stotal.
-D 2024-06-24T15:05:28.273
+C Do\snot\suse\sinteger\sconstants\slike\s100_000\sin\sthe\sshell\scode\son\sthis\sbranch.\sThey\sare\snot\ssupported\suntil\s3.46.
+D 2024-06-26T16:33:49.079
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -747,7 +747,7 @@ F src/random.c 9bd018738ec450bf35d28050b4b33fa9a6eebf3aaefb1a1cff42dc14a7725673
 F src/resolve.c 446bcb8ebf0ea7066c2ca99e5336f0dbc9230ac76f80fafd1bfa82fe7871af2d
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c c581265a87628e1abcff72df3e96b56d89e8137ddb780d2522863cce08cf43cd
-F src/shell.c.in 5b255e2b7d08cdb7b0adeec11df12a09fcbc1e429f1291001dcf251b4b380fba
+F src/shell.c.in 627eb35078011f55509c0cbc28889fbb01cfb4370bf52e6195ba97c885408009
 F src/sqlite.h.in 882c85b1dbe2988af021a2fe60cd65a0c321f0a3f04ef762e0f3f07ebb53e040
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
@@ -2197,9 +2197,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 66c885814e1c533f0f45ee01b6b25cd5ec08770d699e441b1af4f79b23e9f0a7
-Q +1535828335d2b0eccebae952ed2bc70cc0cd893bd4b079d26b80deff9b5f752b
-R bcb9c4749d4d329d32c84510ae888dfd
+P d826236e22234bd0ab7888d26f2f2eeb8f109099c8936b62dedf6597df386e45
+R 9eb88d989bb072bea96be1908cd8aab6
 U dan
-Z 84abe36ce5967e2ec86fcaf29accb16f
+Z 4c154b3d171d516e7931f00094ab9ab5
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index d44863fad59e7a13af029bf31deda20a56235dbf..35a89ada413964bc8811d8a15909f062dc5d1361 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d826236e22234bd0ab7888d26f2f2eeb8f109099c8936b62dedf6597df386e45
+8362edb45b993f8467b464ca0491ef347c8215ea2e65504f7b3d1f7232eb3c63

diff --git a/src/shell.c.in b/src/shell.c.in
index cddd4351787cc3e2a22c85c70b0e26a8d7e07b83..420b3cad851f20f31fb891fb121b2137d360a151 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -3419,10 +3419,10 @@ static void display_scanstats(
     const char *zSql =
       "  SELECT addr, opcode, p1, p2, p3, p4, p5, comment, nexec,"
       "   format('% 6s (%.2f%%)',"
-      "      CASE WHEN ncycle<100_000 THEN ncycle || ' '"
-      "         WHEN ncycle<100_000_000 THEN (ncycle/1_000) || 'K'"
-      "         WHEN ncycle<100_000_000_000 THEN (ncycle/1_000_000) || 'M'"
-      "         ELSE (ncycle/1000_000_000) || 'G' END,"
+      "      CASE WHEN ncycle<100000 THEN ncycle || ' '"
+      "         WHEN ncycle<100000000 THEN (ncycle/1000) || 'K'"
+      "         WHEN ncycle<100000000000 THEN (ncycle/1000000) || 'M'"
+      "         ELSE (ncycle/1000000000) || 'G' END,"
       "       ncycle*100.0/(sum(ncycle) OVER ())"
       "   )  AS cycles"
       "   FROM bytecode(?)";