diff options
| author | drh <drh@noemail.net> | 2013-07-11 15:31:57 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2013-07-11 15:31:57 +0000 |
| commit | 6f855952d07e32967b84c790201da4b45d849722 (patch) | |
| tree | 61ad985a23e7575c56506c7c905f2965ea508715 /src/sqliteInt.h | |
| parent | 07001c45a1cfe57cab888ddee16288d23f5fd344 (diff) | |
| parent | b1eaa718fdc61f87395ea92919be13e203754382 (diff) | |
| download | sqlite-6f855952d07e32967b84c790201da4b45d849722.tar.gz sqlite-6f855952d07e32967b84c790201da4b45d849722.zip | |
Merge recent trunk changes (such as the query_only PRAGMA, the
defer_foreign_keys PRAGMA, and the SQLITE_DBSTATUS_DEFERRED_FKS parameter
to sqlite3_db_status()) into the sessions branch.
FossilOrigin-Name: 8dfc0b78c38e519b64a796243ff7c0aff688ff36
Diffstat (limited to 'src/sqliteInt.h')
| -rw-r--r-- | src/sqliteInt.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/sqliteInt.h b/src/sqliteInt.h index f989c3a30..86d0804fa 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -944,7 +944,7 @@ struct sqlite3 { #ifndef SQLITE_OMIT_PROGRESS_CALLBACK int (*xProgress)(void *); /* The progress callback */ void *pProgressArg; /* Argument to the progress callback */ - int nProgressOps; /* Number of opcodes for progress callback */ + unsigned nProgressOps; /* Number of opcodes for progress callback */ #endif #ifndef SQLITE_OMIT_VIRTUALTABLE int nVTrans; /* Allocated size of aVTrans */ @@ -1019,6 +1019,8 @@ struct sqlite3 { #define SQLITE_LoadExtension 0x00200000 /* Enable load_extension */ #define SQLITE_EnableTrigger 0x00400000 /* True to enable triggers */ #define SQLITE_DeferFKs 0x00800000 /* Defer all FK constraints */ +#define SQLITE_QueryOnly 0x01000000 /* Disable database changes */ + /* ** Bits of the sqlite3.dbOptFlags field that are used by the |