From: shane <shane@noemail.net>
Date: Thu, 31 Jul 2008 01:40:42 +0000 (+0000)
Subject: Omit calls to sqlite3Pragma() if SQLITE_OMIT_PARSER defined.  Not technically needed... 
X-Git-Tag: version-3.6.10~671
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=04e86f4d99668590ddfe68cfe88d2cfa3ae32af6;p=thirdparty%2Fsqlite.git

Omit calls to sqlite3Pragma() if SQLITE_OMIT_PARSER defined.  Not technically needed, as the entire generated parse.c file should not be included. (CVS 5506)

FossilOrigin-Name: 10e0450896a8b92b160f2e670e8d5a909c1c67ba
---

diff --git a/manifest b/manifest
index a43688b953..0488e4e8c3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\sretry\slogic\sfor\swinDelete()\swhen\sin\s"pending\sdelete"\sstate.\s(CVS\s5505)
-D 2008-07-31T01:34:34
+C Omit\scalls\sto\ssqlite3Pragma()\sif\sSQLITE_OMIT_PARSER\sdefined.\s\sNot\stechnically\sneeded,\sas\sthe\sentire\sgenerated\sparse.c\sfile\sshould\snot\sbe\sincluded.\s(CVS\s5506)
+D 2008-07-31T01:40:42
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in bbb62eecc851379aef5a48a1bf8787eb13e6ec06
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -137,7 +137,7 @@ F src/os_unix.c fe0dbc35bcd3de49e46b132abfc0f45d6dd6a864
 F src/os_win.c aefe9ee26430678a19a058a874e4e2bd91398142
 F src/pager.c a6ecad26297469a8a3d1fd7a7c3dc2d603955044
 F src/pager.h 588c1ac195228b2da45c4e5f7ab6c2fd253d1751
-F src/parse.y 5ce0b04d2d35b987ccca8b46cfc2527dd932f040
+F src/parse.y d962e544d9953289db23c1d4cc2dab514c7136fa
 F src/pragma.c 6e207b4f69901089758c02c02e0bf86ed12a4d8f
 F src/prepare.c d2d53aec81517f8666450aa5fd1a041a3b72320e
 F src/printf.c 2e984b2507291a7e16d89dc9bb60582904f6247d
@@ -614,7 +614,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P a480a8845fb3b49967de0790b30e6250c824b9be
-R 7b2f7cd10860e5c19f09f3db17699242
+P 03a7973477b419d21c3b2925aa90efb05ff64ef9
+R fd53a4a64e6650f05cf1b9c15187720e
 U shane
-Z 43b2cced62bf2bf8c1e2bb2193bc268a
+Z 4ae4da7a0bdc0d42d5011b94afa246ba
diff --git a/manifest.uuid b/manifest.uuid
index 484e004d99..5a1e0988da 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-03a7973477b419d21c3b2925aa90efb05ff64ef9
\ No newline at end of file
+10e0450896a8b92b160f2e670e8d5a909c1c67ba
\ No newline at end of file
diff --git a/src/parse.y b/src/parse.y
index 8fe3acb757..b2cbe9bcab 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -14,7 +14,7 @@
 ** the parser.  Lemon will also generate a header file containing
 ** numeric codes for all of the tokens.
 **
-** @(#) $Id: parse.y,v 1.247 2008/07/28 19:34:53 drh Exp $
+** @(#) $Id: parse.y,v 1.248 2008/07/31 01:40:42 shane Exp $
 */
 
 // All token codes are small integers with #defines that begin with "TK_"
@@ -931,6 +931,7 @@ cmd ::= VACUUM nm.             {sqlite3Vacuum(pParse);}
 
 ///////////////////////////// The PRAGMA command /////////////////////////////
 //
+%ifndef SQLITE_OMIT_PARSER
 %ifndef SQLITE_OMIT_PRAGMA
 cmd ::= PRAGMA nm(X) dbnm(Z) EQ nmnum(Y).   {sqlite3Pragma(pParse,&X,&Z,&Y,0);}
 cmd ::= PRAGMA nm(X) dbnm(Z) EQ ON(Y).      {sqlite3Pragma(pParse,&X,&Z,&Y,0);}
@@ -943,6 +944,7 @@ cmd ::= PRAGMA nm(X) dbnm(Z).             {sqlite3Pragma(pParse,&X,&Z,0,0);}
 nmnum(A) ::= plus_num(X).             {A = X;}
 nmnum(A) ::= nm(X).                   {A = X;}
 %endif SQLITE_OMIT_PRAGMA
+%endif SQLITE_OMIT_PARSER
 plus_num(A) ::= plus_opt number(X).   {A = X;}
 minus_num(A) ::= MINUS number(X).     {A = X;}
 number(A) ::= INTEGER|FLOAT(X).       {A = X;}