Incorporate ..._DESERIALIZE revision.

FossilOrigin-Name: b70587cca9e4f0116621e27362186e9329bcea8016c6565cd3ec5a9bf4a99d46

diff --git a/manifest b/manifest
index 231f1fbf9c2ea7a4694f208acea3bc36915aa868..71b5636dee37a5a2f2a72ab19f3d738d0204c71c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C merge\sfrom\strunk
-D 2021-05-19T19:55:10.206
+C Incorporate\s..._DESERIALIZE\srevision.
+D 2021-05-19T20:01:53.234
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -490,7 +490,7 @@ F src/btreeInt.h 7bc15a24a02662409ebcd6aeaa1065522d14b7fda71573a2b0568b458f514ae
 F src/build.c 4e13b92f77d3f6dc1285c3636a2ba7c6af5cbb793e52075a762fbcebcd36e968
 F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
-F src/ctime.c fbc6243075128ddf187ec469a6d178ebd58bb6eae8e3ba191446fa18cffb17c3
+F src/ctime.c 3052b6b05ed9ef547a3dd66b8e01bfa9d582e78752ad6ed327da84652641e038
 F src/date.c e0632f335952b32401482d099321bbf12716b29d6e72836b53ae49683ebae4bf
 F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
 F src/dbstat.c 3aa79fc3aed7ce906e4ea6c10e85d657299e304f6049861fe300053ac57de36c
@@ -1840,7 +1840,7 @@ F tool/logest.c 11346aa019e2e77a00902aa7d0cabd27bd2e8cca
 F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439
 F tool/mkautoconfamal.sh f62353eb6c06ab264da027fd4507d09914433dbdcab9cb011cdc18016f1ab3b8
 F tool/mkccode.tcl 86463e68ce9c15d3041610fedd285ce32a5cf7a58fc88b3202b8b76837650dbe x
-F tool/mkctimec.tcl 6469850ad5e9f9173046da7569a0a6f40c5b21316406b70aaa029b357bc8d220
+F tool/mkctimec.tcl 06b0d503ee0e6c2d4abe83563b43d4925a12e31ec9fb3249ce39661f53fbd1ce
 F tool/mkkeywordhash.c 08b6e4d7a482a7f37a9a0032e7ba968e26624a027b6b2e9ba589be6f5e3d8c2c
 F tool/mkmsvcmin.tcl 6ecab9fe22c2c8de4d82d4c46797bda3d2deac8e763885f5a38d0c44a895ab33
 F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
@@ -1913,7 +1913,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 3ff228249adf2da345d3e19e9af3e23d1354f6b9a35ddbe9864e1a07716d871c 4e81ea3b15fb3fce5f31b77273639e748a735ab0970620e564e9a5c977b24a1a
-R ea5c2f2d0e31f28da39a2a85c2aa9d20
+P 19ffe3cfe278a4046f32df56f75080c2377e4c44ad40a02d39db8e7701526204
+R b79079c9927fb0cb56cad0473e73ea54
 U larrybr
-Z aa5a2c613a1eb5b66660089c16f7322a
+Z 0c270da26eb4d97d44b3fbdea701b7af

diff --git a/manifest.uuid b/manifest.uuid
index e1633a6196a2d29d8590c2e06daa21d21c98acbc..f59f8b91676b5405834525274d28dfe516d27573 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-19ffe3cfe278a4046f32df56f75080c2377e4c44ad40a02d39db8e7701526204
\ No newline at end of file
+b70587cca9e4f0116621e27362186e9329bcea8016c6565cd3ec5a9bf4a99d46
\ No newline at end of file

diff --git a/src/ctime.c b/src/ctime.c
index 7aae08d7460ffe8a7f97921d82fd3548c944d356..fa69216c6d8aab0daadfefb116941b69e012d44c 100644 (file)
--- a/src/ctime.c
+++ b/src/ctime.c
@@ -221,9 +221,6 @@ static const char * const sqlite3azCompileOpt[] = {
 #if SQLITE_ENABLE_DBSTAT_VTAB
   "ENABLE_DBSTAT_VTAB",
 #endif
-#if SQLITE_ENABLE_DESERIALIZE
-  "ENABLE_DESERIALIZE",
-#endif
 #if SQLITE_ENABLE_EXPENSIVE_ASSERT
   "ENABLE_EXPENSIVE_ASSERT",
 #endif
@@ -553,6 +550,9 @@ static const char * const sqlite3azCompileOpt[] = {
 #if SQLITE_OMIT_DEPRECATED
   "OMIT_DEPRECATED",
 #endif
+#if SQLITE_OMIT_DESERIALIZE
+  "OMIT_DESERIALIZE",
+#endif
 #if SQLITE_OMIT_DISKIO
   "OMIT_DISKIO",
 #endif

diff --git a/tool/mkctimec.tcl b/tool/mkctimec.tcl
index 2861ae93d4633e53bbc38d2d6d26ec66d42e66d6..2f15ac9fb7ce9e69027adbb5bbbe6d3202028974 100644 (file)
--- a/tool/mkctimec.tcl
+++ b/tool/mkctimec.tcl
@@ -59,7 +59,6 @@ set boolean_defnil_options {
   SQLITE_ENABLE_CURSOR_HINTS
   SQLITE_ENABLE_DBPAGE_VTAB
   SQLITE_ENABLE_DBSTAT_VTAB
-  SQLITE_ENABLE_DESERIALIZE
   SQLITE_ENABLE_EXPENSIVE_ASSERT
   SQLITE_ENABLE_EXPLAIN_COMMENTS
   SQLITE_ENABLE_FTS3
@@ -142,6 +141,7 @@ set boolean_defnil_options {
   SQLITE_OMIT_CTE
   SQLITE_OMIT_DECLTYPE
   SQLITE_OMIT_DEPRECATED
+  SQLITE_OMIT_DESERIALIZE
   SQLITE_OMIT_DISKIO
   SQLITE_OMIT_EXPLAIN
   SQLITE_OMIT_FLAG_PRAGMAS