Modify the memstat virtual table so that it works with SQLite version 3.9.2.

FossilOrigin-Name: 7171d8ae6b1e7c97b0cf06bcca2262674c9ce557c85666b4b77c16cbac508502

diff --git a/ext/misc/memstat.c b/ext/misc/memstat.c
index 84078c9cebe0b3641db3dd1a2457c307a317d68b..e594d1de21b7c2dc91830dc4048666b37f33e133 100644 (file)
--- a/ext/misc/memstat.c
+++ b/ext/misc/memstat.c
@@ -241,8 +241,15 @@ static int memstatNext(sqlite3_vtab_cursor *cur){
     pCur->aVal[1] = 0;    
     switch( aMemstatColumn[i].eType ){
       case MSV_GSTAT: {
-        sqlite3_status64(aMemstatColumn[i].eOp,
-                         &pCur->aVal[0], &pCur->aVal[1],0);
+        if( sqlite3_libversion_number()>=3010000 ){
+          sqlite3_status64(aMemstatColumn[i].eOp,
+                           &pCur->aVal[0], &pCur->aVal[1],0);
+        }else{
+          int xCur, xHiwtr;
+          sqlite3_status(aMemstatColumn[i].eOp, &xCur, &xHiwtr, 0);
+          pCur->aVal[0] = xCur;
+          pCur->aVal[1] = xHiwtr;
+        }
         break;
       }
       case MSV_DB: {

diff --git a/manifest b/manifest
index 420b2640887975420e0c1e3f02f9acadf5ff6d38..dfad76e2c15ca5b2b5ee3e382efd6740881f08d9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\ssqlite_memstat\sextension\s-\san\seponymous\svirtual\stable\sthat\sshows\nmemory\susages\sstatistics\sfor\sSQLite.
-D 2018-09-27T17:03:03.584
+C Modify\sthe\smemstat\svirtual\stable\sso\sthat\sit\sworks\swith\sSQLite\sversion\s3.9.2.
+D 2018-09-27T17:15:21.554
 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 1db91b25c9a4a1b73696c14d32a5b39adf6d2e9b11d0cdb5a9f35e86e3da7d36
+F ext/misc/memstat.c ce3234df2be6afb02729f62533314857835c3fd140ef48592fc78b9152c2fa17
 F ext/misc/memvfs.c ab36f49e02ebcdf85a1e08dc4d8599ea8f343e073ac9e0bca18a98b7e1ec9567
 F ext/misc/mmapwarm.c 70b618f2d0bde43fae288ad0b7498a629f2b6f61b50a27e06fae3cd23c83af29
 F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342
@@ -1770,8 +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 7fc2994434c7d9ed29c96a69c07e8eb4e97be776473c170c63f9a1bbaa09fa68 9351135b4331107be2f2bda7b6adbd5436381f4f9a68340e8a172b6517ec3f12
-R 3b442b9685bf2fd6f2b22a8d8be22779
-T +closed 9351135b4331107be2f2bda7b6adbd5436381f4f9a68340e8a172b6517ec3f12
+P 954ef61f6a02532e72c815208ec839310f1e00d69e0003cc6f5426f0559229d1
+R 766859725d09447be1e489bf0682d831
 U drh
-Z aae6139285457822a13630c1c5df83e8
+Z 1657115b7ebcf651e92fc89a965c8bf1

diff --git a/manifest.uuid b/manifest.uuid
index 007d68f9e44abecfee1597d3ec82c48299e5c1e0..a9e3e1047df7b163e48a28d0e09466f38227823a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-954ef61f6a02532e72c815208ec839310f1e00d69e0003cc6f5426f0559229d1
\ No newline at end of file
+7171d8ae6b1e7c97b0cf06bcca2262674c9ce557c85666b4b77c16cbac508502
\ No newline at end of file