From: danielk1977 <danielk1977@noemail.net>
Date: Sat, 2 Feb 2008 04:47:09 +0000 (+0000)
Subject: When OMIT_TRIGGER is defined, provide a no-op macro for sqlite3SelectMask(). Fix... 
X-Git-Tag: version-3.6.10~1404
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f12107a1c3d1b950e9bb930ef1593d8e26d601c;p=thirdparty%2Fsqlite.git

When OMIT_TRIGGER is defined, provide a no-op macro for sqlite3SelectMask(). Fix for #2918. (CVS 4773)

FossilOrigin-Name: 1d478e9091ef5775297ca4d50c85e39ccdf9e245
---

diff --git a/manifest b/manifest
index c04032c58c..f8d6691699 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\smore\stest\scases\sto\sprove\sthat\sticket\s#2920\sdoes\snot\sexist\sin\r\nCVS\sHEAD.\s\sThe\sproblem\swas\spreviously\sfixed\sby\sthe\schanges\sto\r\nticket\s#2686.\s\sTicket\s#2920\sis\sa\sduplicate\sof\s#2686.\s(CVS\s4772)
-D 2008-02-02T02:48:52
+C When\sOMIT_TRIGGER\sis\sdefined,\sprovide\sa\sno-op\smacro\sfor\ssqlite3SelectMask().\sFix\sfor\s#2918.\s(CVS\s4773)
+D 2008-02-02T04:47:09
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in bc2b5df3e3d0d4b801b824b7ef6dec43812b049b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -137,7 +137,7 @@ F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
 F src/shell.c ca06cb687c40a8bff6307b5fad41a0e86a0f8558
 F src/sqlite.h.in be6caded9ecc1d0da60670334edfb3426cc256d2
 F src/sqlite3ext.h a93f59cdee3638dc0c9c086f80df743a4e68c3cb
-F src/sqliteInt.h b006a4d887af1ce273683cc4874a506254068dbd
+F src/sqliteInt.h 9dabb5a68e1952a556b78558c87e26af2fdb5ddb
 F src/sqliteLimit.h ee4430f88f69bf63527967bb35ca52af7b0ccb1e
 F src/table.c 46ccf9b7892a86f57420ae7bac69ecd5e72d26b5
 F src/tclsqlite.c 9923abeffc9b3d7dad58e92b319661521f60debf
@@ -615,7 +615,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 99275bcd624c57585fc962235082fb0ca213d9c0
-R 3aafbcc2e0daae76937330670eed789c
-U drh
-Z 7068964cc85c01db363987a4b72bce80
+P b3259e872124fd7e17bbc23e582aa4d802044837
+R c877ed8f96aadcd477a6ce4dd7db5292
+U danielk1977
+Z 5f5693316b3f12ee903c9144552eb569
diff --git a/manifest.uuid b/manifest.uuid
index 61e12d7870..dcde632c56 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b3259e872124fd7e17bbc23e582aa4d802044837
\ No newline at end of file
+1d478e9091ef5775297ca4d50c85e39ccdf9e245
\ No newline at end of file
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index b9e884b1df..2f26f588e3 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.658 2008/01/30 16:14:23 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.659 2008/02/02 04:47:09 danielk1977 Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -1760,7 +1760,6 @@ int sqlite3Select(Parse*, Select*, SelectDest*, Select*, int, int*, char *aff);
 Select *sqlite3SelectNew(Parse*,ExprList*,SrcList*,Expr*,ExprList*,
                          Expr*,ExprList*,int,Expr*,Expr*);
 void sqlite3SelectDelete(Select*);
-void sqlite3SelectMask(Parse *, Select *, u32);
 Table *sqlite3SrcListLookup(Parse*, SrcList*);
 int sqlite3IsReadOnly(Parse*, Table*, int);
 void sqlite3OpenTable(Parse*, int iCur, int iDb, Table*, int);
@@ -1846,12 +1845,14 @@ void sqlite3ChangeCookie(Parse*, int);
   TriggerStep *sqlite3TriggerDeleteStep(sqlite3*,Token*, Expr*);
   void sqlite3DeleteTrigger(Trigger*);
   void sqlite3UnlinkAndDeleteTrigger(sqlite3*,int,const char*);
+  void sqlite3SelectMask(Parse *, Select *, u32);
 #else
 # define sqlite3TriggersExist(A,B,C,D,E,F) 0
 # define sqlite3DeleteTrigger(A)
 # define sqlite3DropTriggerPtr(A,B)
 # define sqlite3UnlinkAndDeleteTrigger(A,B,C)
 # define sqlite3CodeRowTrigger(A,B,C,D,E,F,G,H,I,J,K) 0
+# define sqlite3SelectMask(A, B, C)
 #endif
 
 int sqlite3JoinType(Parse*, Token*, Token*, Token*);