|
|
@@ -1,7 +1,7 @@
|
|
|
Index: Makefile.in
|
|
|
---- Makefile.in.orig 2008-08-05 21:58:48 +0200
|
|
|
-+++ Makefile.in 2008-08-07 09:09:15 +0200
|
|
|
-@@ -178,6 +178,30 @@
|
|
|
+--- Makefile.in.orig 2008-08-26 14:24:48 +0200
|
|
|
++++ Makefile.in 2008-08-31 10:05:44 +0200
|
|
|
+@@ -179,6 +179,30 @@
|
|
|
LIBOBJ = $(OBJS$(USE_AMALGAMATION))
|
|
|
|
|
|
|
|
|
@@ -32,7 +32,7 @@ Index: Makefile.in
|
|
|
# All of the source code files.
|
|
|
#
|
|
|
SRC = \
|
|
|
-@@ -764,3 +788,38 @@
|
|
|
+@@ -779,3 +803,38 @@
|
|
|
sqlite3.dll: $(REAL_LIBOBJ) sqlite3.def
|
|
|
$(TCC) -shared -o $@ sqlite3.def \
|
|
|
-Wl,"--strip-all" $(REAL_LIBOBJ)
|
|
|
@@ -73,7 +73,7 @@ Index: Makefile.in
|
|
|
+
|
|
|
Index: sqlite3.pc.in
|
|
|
--- sqlite3.pc.in.orig 2008-07-16 17:50:43 +0200
|
|
|
-+++ sqlite3.pc.in 2008-08-07 09:09:15 +0200
|
|
|
++++ sqlite3.pc.in 2008-08-31 10:05:44 +0200
|
|
|
@@ -8,6 +8,5 @@
|
|
|
Name: SQLite
|
|
|
Description: SQL database engine
|
|
|
@@ -82,31 +82,3 @@ Index: sqlite3.pc.in
|
|
|
-Libs.private: @LIBS@
|
|
|
+Libs: -L${libdir} -lsqlite3 @LIBS@
|
|
|
Cflags: -I${includedir}
|
|
|
-
|
|
|
------------------------------------------------------------------------------
|
|
|
-
|
|
|
-Upstream Vendor CVS Patches (can be removed with SQLite 3.6.2)
|
|
|
-
|
|
|
-Index: src/build.c
|
|
|
---- src/build.c 2008/08/04 04:39:49 1.493
|
|
|
-+++ src/build.c 2008/08/06 13:47:41 1.494
|
|
|
-@@ -2136,6 +2136,7 @@
|
|
|
- ExprList *pToCol, /* Columns in the other table */
|
|
|
- int flags /* Conflict resolution algorithms. */
|
|
|
- ){
|
|
|
-+ sqlite3 *db = pParse->db;
|
|
|
- #ifndef SQLITE_OMIT_FOREIGN_KEY
|
|
|
- FKey *pFKey = 0;
|
|
|
- Table *p = pParse->pNewTable;
|
|
|
-@@ -2143,10 +2144,8 @@
|
|
|
- int i;
|
|
|
- int nCol;
|
|
|
- char *z;
|
|
|
-- sqlite3 *db;
|
|
|
-
|
|
|
- assert( pTo!=0 );
|
|
|
-- db = pParse->db;
|
|
|
- if( p==0 || pParse->nErr || IN_DECLARE_VTAB ) goto fk_end;
|
|
|
- if( pFromCol==0 ){
|
|
|
- int iCol = p->nCol-1;
|
|
|
-
|
