From: drh <drh@noemail.net>
Date: Mon, 28 Dec 2020 21:42:38 +0000 (+0000)
Subject: Fix missing comma in ctime.c that would cause the ENABLE_MATH_FUNCTIONS
X-Git-Tag: version-3.35.0~162
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=277a30d9ce5ea64a36b2b970c3e39c275e6999b8;p=thirdparty%2Fsqlite.git

Fix missing comma in ctime.c that would cause the ENABLE_MATH_FUNCTIONS
output rw to merge with whatever row followed.  Problem reported in
[forum:/forumpost/aacac97680|forum post aacac97680].

FossilOrigin-Name: 328bc4a01dd67096be49c8b5a656109ad2839a7959d1b00c02a96bfbcb44ec18
---

diff --git a/manifest b/manifest
index fddff0b8a5..28ec51ccf2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\ssqlite3session_memory_used()\sAPI\sto\sthe\ssessions\smodule.\sFor\squerying\sthe\samount\sof\sheap\smemory\scurrently\sbeing\sused\sby\sa\ssession\sobject.
-D 2020-12-23T16:46:39.915
+C Fix\smissing\scomma\sin\sctime.c\sthat\swould\scause\sthe\sENABLE_MATH_FUNCTIONS\noutput\srw\sto\smerge\swith\swhatever\srow\sfollowed.\s\sProblem\sreported\sin\n[forum:/forumpost/aacac97680|forum\spost\saacac97680].
+D 2020-12-28T21:42:38.075
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -487,7 +487,7 @@ F src/btreeInt.h 7614cae30f95b6aed0c7cac7718276a55cfe2c77058cbfd8bef5b7532975733
 F src/build.c f6449d4e85e998e14d3f537e8ea898dca2fcb83c277db3e60945af9b9177db81
 F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
-F src/ctime.c 0bcc6a908779a520be534fd985b2185dfd457588b6798d0bcbf37755a044b7c3
+F src/ctime.c 2a322b9a3d75771fb4d99e0702851f4f68dda982507a0f798eefb0712969a410
 F src/date.c dace306a10d9b02ee553d454c8e1cf8d3c9b932e137738a6b15b90253a9bfc10
 F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
 F src/dbstat.c 3aa79fc3aed7ce906e4ea6c10e85d657299e304f6049861fe300053ac57de36c
@@ -1894,7 +1894,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 9587fa8b29fc2f91d751a71b909f574014656f24d276b4974f47fcc18dbadcb8
-R 8a19a9976fc51c3ed2ff74d48489d86a
-U dan
-Z bb9f93711cbcff6309bc973aaedad8c7
+P 823f75c2e448b649cbe9e174be21524ae3f580beedced65701ad49a2dcc5ee19
+R 4cea6028a24f1360fba1c7d5e36beba8
+U drh
+Z 164f7b84f32a08eccc89b53be84f4226
diff --git a/manifest.uuid b/manifest.uuid
index 541e80f318..09aa60792c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-823f75c2e448b649cbe9e174be21524ae3f580beedced65701ad49a2dcc5ee19
\ No newline at end of file
+328bc4a01dd67096be49c8b5a656109ad2839a7959d1b00c02a96bfbcb44ec18
\ No newline at end of file
diff --git a/src/ctime.c b/src/ctime.c
index f0fdccbdc1..7982f23aeb 100644
--- a/src/ctime.c
+++ b/src/ctime.c
@@ -260,7 +260,7 @@ static const char * const sqlite3azCompileOpt[] = {
   "ENABLE_LOCKING_STYLE=" CTIMEOPT_VAL(SQLITE_ENABLE_LOCKING_STYLE),
 #endif
 #if SQLITE_ENABLE_MATH_FUNCTIONS
-  "ENABLE_MATH_FUNCTIONS"
+  "ENABLE_MATH_FUNCTIONS",
 #endif
 #if SQLITE_ENABLE_MEMORY_MANAGEMENT
   "ENABLE_MEMORY_MANAGEMENT",