From: drh <drh@noemail.net>
Date: Wed, 16 Jan 2013 20:33:02 +0000 (+0000)
Subject: Fix the activate_extensions pragma so that it is a no-op when the required
X-Git-Tag: version-3.7.16~71
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7fe18b41052f11f68d21672f2ec65db0a1f761cf;p=thirdparty%2Fsqlite.git

Fix the activate_extensions pragma so that it is a no-op when the required
argument is omitted.

FossilOrigin-Name: 6195ebd83323eaad92a0aa095cce1094bf8e2ba6
---

diff --git a/manifest b/manifest
index a878fe5539..45d665a461 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improvements\sto\squery\splanning\sfor\sjoins:\s\sAvoid\sunnecessary\scalls\sto\n"optimal\sscan"\schecks\sin\scases\swhere\stable\sreordering\sis\snot\spossible.\nMake\ssure\soptimal\sscan\schecks\sare\scarried\sout\sfor\sCROSS\sJOINs\sand\sLEFT\nJOINs.
-D 2013-01-16T00:46:09.175
+C Fix\sthe\sactivate_extensions\spragma\sso\sthat\sit\sis\sa\sno-op\swhen\sthe\srequired\nargument\sis\somitted.
+D 2013-01-16T20:33:02.794
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in a48faa9e7dd7d556d84f5456eabe5825dd8a6282
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -168,7 +168,7 @@ F src/parse.y 5d5e12772845805fdfeb889163516b84fbb9ae95
 F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
 F src/pcache.h 1b5dcc3dc8103d03e625b177023ee67764fa6b7c
 F src/pcache1.c 9fd22671c270b35131ef480bbc00392b8b5f8ab9
-F src/pragma.c 8907c559d3127729d3bcedb1fe5c59fc196d3a17
+F src/pragma.c b7ef175454106000fae966b3948b19e807bffc89
 F src/prepare.c 931ad0d852a0df48f79adcba6ce79ca5f475625c
 F src/printf.c 4a9f882f1c1787a8b494a2987765acf9d97ac21f
 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
@@ -1033,7 +1033,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P ac4e119a87497f2e422ff1cb711112ed8594bfa9
-R 604db48c0336d28f8c2561951db4000b
+P d5ebb7877885839e93eee3b322624d4c4215c1c4
+R 7e1018eedcfc760a5a5a61f3eb36bf10
 U drh
-Z 14d78037173bf002814299854e4b798b
+Z cc9e1bb14175b94a3737a5872056637d
diff --git a/manifest.uuid b/manifest.uuid
index 536565f198..bcd1128fbe 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d5ebb7877885839e93eee3b322624d4c4215c1c4
\ No newline at end of file
+6195ebd83323eaad92a0aa095cce1094bf8e2ba6
\ No newline at end of file
diff --git a/src/pragma.c b/src/pragma.c
index 7e8b59b8e4..7d116d5bbc 100644
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -1733,7 +1733,7 @@ void sqlite3Pragma(
   }else
 #endif
 #if defined(SQLITE_HAS_CODEC) || defined(SQLITE_ENABLE_CEROD)
-  if( sqlite3StrICmp(zLeft, "activate_extensions")==0 ){
+  if( sqlite3StrICmp(zLeft, "activate_extensions")==0 && zRight ){
 #ifdef SQLITE_HAS_CODEC
     if( sqlite3StrNICmp(zRight, "see-", 4)==0 ){
       sqlite3_activate_see(&zRight[4]);