commit 33752f8acf318f1a46040b3b9613b7f956989794
author danielk1977 <danielk1977@noemail.net> Mon May 31 08:55:33 2004 +0000
committer danielk1977 <danielk1977@noemail.net> Mon May 31 08:55:33 2004 +0000
tree 46c842c89cc1a428cded412c4795d2cb0fb23861
parent 1d850a72c265ad9368b322ca39125c9b0c3d8509

Remove the <ON CONFLICT> clause from BEGIN (CVS 1501)

FossilOrigin-Name: 9029274b6129140064bd7ac34df7eaba00d28efb

src/sqliteInt.h

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 9abf2d3..105ac4a 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.262 2004/05/31 08:26:49 danielk1977 Exp $
+** @(#) $Id: sqliteInt.h,v 1.263 2004/05/31 08:55:34 danielk1977 Exp $
 */
 #include "config.h"
 #include "sqlite.h"
@@ -366,7 +366,6 @@
   u8 safety_level;              /* How aggressive at synching data to disk */
   u8 want_to_close;             /* Close after all VDBEs are deallocated */
   u8 temp_store;                /* 1=file, 2=memory, 0=compile-time default */
-  u8 onError;                   /* Default conflict algorithm */
   int next_cookie;              /* Next value of aDb[0].schema_cookie */
   int cache_size;               /* Number of pages to use in the cache */
   int nTable;                   /* Number of tables in the database */
@@ -1263,7 +1262,7 @@
 void sqlite3Randomness(int, void*);
 void sqlite3RollbackAll(sqlite*);
 void sqlite3CodeVerifySchema(Parse*, int);
-void sqlite3BeginTransaction(Parse*, int);
+void sqlite3BeginTransaction(Parse*);
 void sqlite3CommitTransaction(Parse*);
 void sqlite3RollbackTransaction(Parse*);
 int sqlite3ExprIsConstant(Expr*);