From: drh <drh@noemail.net>
Date: Thu, 20 Aug 2015 18:28:46 +0000 (+0000)
Subject: Prevent the series.c extension from loading on older versions of SQLite that
X-Git-Tag: version-3.9.0~215^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b81fba193079eb6276b3fc94849d847b47c5544e;p=thirdparty%2Fsqlite.git

Prevent the series.c extension from loading on older versions of SQLite that
do not support xCreate==NULL.

FossilOrigin-Name: 3efc79427ef4686142d074cfe5b2f0a33af19b2e
---

diff --git a/ext/misc/series.c b/ext/misc/series.c
index 645ddeab15..892426bacb 100644
--- a/ext/misc/series.c
+++ b/ext/misc/series.c
@@ -389,6 +389,11 @@ int sqlite3_series_init(
   int rc = SQLITE_OK;
   SQLITE_EXTENSION_INIT2(pApi);
 #ifndef SQLITE_OMIT_VIRTUALTABLE
+  if( sqlite3_libversion_number()<3008012 ){
+    *pzErrMsg = sqlite3_mprintf(
+        "generate_series() requires SQLite 3.8.12 or later");
+    return SQLITE_ERROR;
+  }
   rc = sqlite3_create_module(db, "generate_series", &seriesModule, 0);
 #endif
   return rc;
diff --git a/manifest b/manifest
index ab8f0ade60..4b88941c4f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stypo\sin\sseries.c.
-D 2015-08-20T16:16:37.345
+C Prevent\sthe\sseries.c\sextension\sfrom\sloading\son\solder\sversions\sof\sSQLite\sthat\ndo\snot\ssupport\sxCreate==NULL.
+D 2015-08-20T18:28:46.970
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 4f663b6b4954b9b1eb0e6f08387688a93b57542d
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -196,7 +196,7 @@ F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342
 F ext/misc/percentile.c bcbee3c061b884eccb80e21651daaae8e1e43c63
 F ext/misc/regexp.c af92cdaa5058fcec1451e49becc7ba44dba023dc
 F ext/misc/rot13.c 1ac6f95f99b575907b9b09c81a349114cf9be45a
-F ext/misc/series.c e9b658e442090f75ae01bbf4924feb52a759674c
+F ext/misc/series.c 610bf80e8e85bedf3588907476d4dc2a8cdd013c
 F ext/misc/showauth.c 732578f0fe4ce42d577e1c86dc89dd14a006ab52
 F ext/misc/spellfix.c 86998fb73aefb7b5dc346ba8a58912f312da4996
 F ext/misc/totype.c 4a167594e791abeed95e0a8db028822b5e8fe512
@@ -1376,7 +1376,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P a325a08599759471047e234ef9cfcc3cb110aafd
-R c7d0daf8fbeee011c3f976b2caec6772
-U dan
-Z e8e4b80135954d12498e194483d7037d
+P 23db7f50f14801c2cf56c006d7c7f593908b7158
+R d99fb6b924c5803dd958720cff95849c
+U drh
+Z a0d63a9f28ce5db0938546bd2b7f7c87
diff --git a/manifest.uuid b/manifest.uuid
index f79d828421..e9329d72f7 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-23db7f50f14801c2cf56c006d7c7f593908b7158
\ No newline at end of file
+3efc79427ef4686142d074cfe5b2f0a33af19b2e
\ No newline at end of file