From: drh <drh@noemail.net>
Date: Fri, 24 Feb 2012 00:03:12 +0000 (+0000)
Subject: If the SQLITE_FCNTL_PRAGMA file control returns something other than
X-Git-Tag: version-3.7.11~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d93684874cd3cde65f0c433e32d840de09af9f4;p=thirdparty%2Fsqlite.git

If the SQLITE_FCNTL_PRAGMA file control returns something other than
SQLITE_NOTFOUND, then skip the rest of Pragma code generation.

FossilOrigin-Name: 9e6d340f557c2f2c8a07300ac60357af9906a7fa
---

diff --git a/manifest b/manifest
index ff6ebe0f79..ddf61903cc 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C A\ssimple\schange\sthat\sallows\sthe\sSQLITE_32BIT_ROWID\scompile-time\soption\sto\nwork\sbetter.
-D 2012-02-24T00:02:28.766
+C If\sthe\sSQLITE_FCNTL_PRAGMA\sfile\scontrol\sreturns\ssomething\sother\sthan\nSQLITE_NOTFOUND,\sthen\sskip\sthe\srest\sof\sPragma\scode\sgeneration.
+D 2012-02-24T00:03:12.589
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 3f79a373e57c3b92dabf76f40b065e719d31ac34
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -174,7 +174,7 @@ F src/parse.y 1ddd71ae55f4b7cbb2672526ea4de023de0f519e
 F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
 F src/pcache.h 1b5dcc3dc8103d03e625b177023ee67764fa6b7c
 F src/pcache1.c b30b1c35908346ecc43d8d9d17f2ddf6817f8f60
-F src/pragma.c a6b1b209a143fd235fe61cad4bf4e0d1f765f5ce
+F src/pragma.c 11f5fff828e00ece318eefc8c8808b4fc9835739
 F src/prepare.c ec4989f7f480544bdc4192fe663470d2a2d7d61e
 F src/printf.c 7ffb4ebb8b341f67e049695ba031da717b3d2699
 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
@@ -990,7 +990,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P c8c7846fb990199dcc0774a69e8257510bc36f2d
-R c536366575fdc7c1acdfd3976080e3e1
+P f9df4063fbd100ce306a89fc649c1860fd801f31
+R 918c6dd4ec2727a8cb49f3dbede7e930
 U drh
-Z e5f81487e506b4905e600ae695ff035e
+Z a93fbf9532fae037d0b7a67217939ce5
diff --git a/manifest.uuid b/manifest.uuid
index 479220e768..40120e066a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f9df4063fbd100ce306a89fc649c1860fd801f31
\ No newline at end of file
+9e6d340f557c2f2c8a07300ac60357af9906a7fa
\ No newline at end of file
diff --git a/src/pragma.c b/src/pragma.c
index 7330e39d14..bc1469b798 100644
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -374,7 +374,7 @@ void sqlite3Pragma(
     }
     pParse->nErr++;
     pParse->rc = rc;
-  }
+  }else
                             
  
 #if !defined(SQLITE_OMIT_PAGER_PRAGMAS) && !defined(SQLITE_OMIT_DEPRECATED)