Differences From:

File src/sqlite3.c part of check-in [856e23a19b] - Merge with 076f7adff. by dmitry on 2009-10-15 08:01:58. Also file src/sqlite3.c part of check-in [076f7adff2] - Update to the latest version of SQLite. by drh on 2009-10-13 16:25:41. [view]

To:

File src/sqlite3.c part of check-in [232d10b736] - Begin adding a search capability; the code is not yet connected up. Also update to the latest version of SQLite. by drh on 2009-10-18 18:21:37. [view]

@@ -16,9 +16,9 @@
 ** if you want a wrapper to interface SQLite with your choice of programming
 ** language. The code for the "sqlite3" command-line shell is also in a
 ** separate file. This file contains only code for the core SQLite library.
 **
-** This amalgamation was generated on 2009-10-13 16:22:00 UTC.
+** This amalgamation was generated on 2009-10-14 11:34:12 UTC.
 */
 #define SQLITE_CORE 1
 #define SQLITE_AMALGAMATION 1
 #ifndef SQLITE_PRIVATE
@@ -652,9 +652,9 @@
 ** Requirements: [H10011] [H10014]
 */
 #define SQLITE_VERSION        "3.6.19"
 #define SQLITE_VERSION_NUMBER 3006019
-#define SQLITE_SOURCE_ID      "2009-10-13 15:42:49 f894ebf86d6bafcd1461f104f5f677b3b6a3aa1a"
+#define SQLITE_SOURCE_ID      "2009-10-14 11:33:55 c1d499afc50d54b376945b4efb65c56c787a073d"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers {H10020} <S60100>
 ** KEYWORDS: sqlite3_version
@@ -8617,9 +8617,9 @@
 ** OP_Savepoint instruction.
 */
 struct Savepoint {
   char *zName;                        /* Savepoint name (nul-terminated) */
-  int nDeferredCons;                  /* Number of deferred fk violations */
+  i64 nDeferredCons;                  /* Number of deferred fk violations */
   Savepoint *pNext;                   /* Parent savepoint (if any) */
 };
 
 /*
@@ -83928,9 +83928,9 @@
     ** recursive invocation of this trigger program is disallowed. Recursive
     ** invocation is disallowed if (a) the sub-program is really a trigger,
     ** not a foreign key action, and (b) the flag to enable recursive triggers
     ** is clear.  */
-    sqlite3VdbeChangeP5(v, p->zName && !(pParse->db->flags&SQLITE_RecTriggers));
+    sqlite3VdbeChangeP5(v, (u8)(p->zName && !(pParse->db->flags&SQLITE_RecTriggers)));
   }
 }
 
 /*