From: dan <dan@noemail.net>
Date: Thu, 27 Sep 2018 17:33:06 +0000 (+0000)
Subject: Another minor tweak to memstat.c so that it may be built against older versions
X-Git-Tag: version-3.26.0~119
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0efb6f51353fcb3bd688d5f1a23c92981079f106;p=thirdparty%2Fsqlite.git

Another minor tweak to memstat.c so that it may be built against older versions
of SQLite.

FossilOrigin-Name: 4c1fed60b9b35ac2f5d2f2533b54db429d72bdbc0aad0dd5af52ff851789d4ae
---

diff --git a/ext/misc/memstat.c b/ext/misc/memstat.c
index e594d1de21..59a5547ce9 100644
--- a/ext/misc/memstat.c
+++ b/ext/misc/memstat.c
@@ -203,13 +203,17 @@ static const struct MemstatColumns {
  {"DB_LOOKASIDE_MISS_SIZE", MSV_DB,     6, SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE},
  {"DB_LOOKASIDE_MISS_FULL", MSV_DB,     6, SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL},
  {"DB_CACHE_USED",          MSV_DB,    10, SQLITE_DBSTATUS_CACHE_USED         },
+#if SQLITE_VERSION_NUMBER >= 3140000
  {"DB_CACHE_USED_SHARED",   MSV_DB,    10, SQLITE_DBSTATUS_CACHE_USED_SHARED  },
+#endif
  {"DB_SCHEMA_USED",         MSV_DB,    10, SQLITE_DBSTATUS_SCHEMA_USED        },
  {"DB_STMT_USED",           MSV_DB,    10, SQLITE_DBSTATUS_STMT_USED          },
  {"DB_CACHE_HIT",           MSV_DB,    10, SQLITE_DBSTATUS_CACHE_HIT          },
  {"DB_CACHE_MISS",          MSV_DB,    10, SQLITE_DBSTATUS_CACHE_MISS         },
  {"DB_CACHE_WRITE",         MSV_DB,    10, SQLITE_DBSTATUS_CACHE_WRITE        },
+#if SQLITE_VERSION_NUMBER >= 3230000
  {"DB_CACHE_SPILL",         MSV_DB,    10, SQLITE_DBSTATUS_CACHE_SPILL        },
+#endif
  {"DB_DEFERRED_FKS",        MSV_DB,    10, SQLITE_DBSTATUS_DEFERRED_FKS       },
 #ifdef SQLITE_ENABLE_ZIPVFS
  {"ZIPVFS_CACHE_USED",      MSV_ZIPVFS, 8, 231454 },
diff --git a/manifest b/manifest
index dfad76e2c1..6fbc136ad0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Modify\sthe\smemstat\svirtual\stable\sso\sthat\sit\sworks\swith\sSQLite\sversion\s3.9.2.
-D 2018-09-27T17:15:21.554
+C Another\sminor\stweak\sto\smemstat.c\sso\sthat\sit\smay\sbe\sbuilt\sagainst\solder\sversions\nof\sSQLite.
+D 2018-09-27T17:33:06.027
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 01e95208a78b57d056131382c493c963518f36da4c42b12a97eb324401b3a334
@@ -286,7 +286,7 @@ F ext/misc/fileio.c 7317d825fab6a3c48f6e3822a00a6a22e08e55af31700ac96f16a523f830
 F ext/misc/fuzzer.c 7c64b8197bb77b7d64eff7cac7848870235d4c25
 F ext/misc/ieee754.c f190d0cc5182529acb15babd177781be1ac1718c
 F ext/misc/json1.c 276f87dc8365b34b0fffb7ef32481dd07fac6fdb3224e2822396a48377ac8363
-F ext/misc/memstat.c ce3234df2be6afb02729f62533314857835c3fd140ef48592fc78b9152c2fa17
+F ext/misc/memstat.c 5bf79f86be9c6ccdcdd3529155a65f64b6fe54fa87553307580fb650125e586a
 F ext/misc/memvfs.c ab36f49e02ebcdf85a1e08dc4d8599ea8f343e073ac9e0bca18a98b7e1ec9567
 F ext/misc/mmapwarm.c 70b618f2d0bde43fae288ad0b7498a629f2b6f61b50a27e06fae3cd23c83af29
 F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342
@@ -1770,7 +1770,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 954ef61f6a02532e72c815208ec839310f1e00d69e0003cc6f5426f0559229d1
-R 766859725d09447be1e489bf0682d831
-U drh
-Z 1657115b7ebcf651e92fc89a965c8bf1
+P 7171d8ae6b1e7c97b0cf06bcca2262674c9ce557c85666b4b77c16cbac508502
+R d47d3de5f232ba29cfc2c94e9ebf7e02
+U dan
+Z f1664a0a39511f75bda0cd3cd52c22bb
diff --git a/manifest.uuid b/manifest.uuid
index a9e3e1047d..473dde99a2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7171d8ae6b1e7c97b0cf06bcca2262674c9ce557c85666b4b77c16cbac508502
\ No newline at end of file
+4c1fed60b9b35ac2f5d2f2533b54db429d72bdbc0aad0dd5af52ff851789d4ae
\ No newline at end of file