diff options
| author | mistachkin <mistachkin@noemail.net> | 2015-04-16 03:24:38 +0000 |
|---|---|---|
| committer | mistachkin <mistachkin@noemail.net> | 2015-04-16 03:24:38 +0000 |
| commit | fb383e9229461dd883852418b6489c091cdce3cd (patch) | |
| tree | e4ff7f3e1f80bbdaf23ead55a502796f58881aaa /src/sqliteInt.h | |
| parent | 00eb70d89c427a6d0e86788346c8ddd6f93d6ec5 (diff) | |
| parent | 22ecef5c20e007ae5121d9febb3bb3d7f56097b0 (diff) | |
| download | sqlite-fb383e9229461dd883852418b6489c091cdce3cd.tar.gz sqlite-fb383e9229461dd883852418b6489c091cdce3cd.zip | |
Merge updates from trunk. Make OSTRACE changes work on Linux.
FossilOrigin-Name: cd1542664eb3eb46d486664ded49cd9c4bef3948
Diffstat (limited to 'src/sqliteInt.h')
| -rw-r--r-- | src/sqliteInt.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 45250bfd1..e22da91e5 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -1226,6 +1226,7 @@ struct sqlite3 { #define SQLITE_DeferFKs 0x01000000 /* Defer all FK constraints */ #define SQLITE_QueryOnly 0x02000000 /* Disable database changes */ #define SQLITE_VdbeEQP 0x04000000 /* Debug EXPLAIN QUERY PLAN */ +#define SQLITE_Vacuum 0x08000000 /* Currently in a VACUUM */ /* @@ -2389,6 +2390,7 @@ struct Select { #define SF_MaybeConvert 0x0400 /* Need convertCompoundSelectToSubquery() */ #define SF_Recursive 0x0800 /* The recursive part of a recursive CTE */ #define SF_MinMaxAgg 0x1000 /* Aggregate containing min() or max() */ +#define SF_Converted 0x2000 /* By convertCompoundSelectToSubquery() */ /* @@ -3491,8 +3493,7 @@ void *sqlite3HexToBlob(sqlite3*, const char *z, int n); u8 sqlite3HexToInt(int h); int sqlite3TwoPartName(Parse *, Token *, Token *, Token **); -#if (defined(SQLITE_DEBUG) && SQLITE_OS_WIN) || \ - (defined(SQLITE_TEST) || defined(SQLITE_FORCE_OS_TRACE)) +#ifdef SQLITE_HAVE_OS_TRACE const char *sqlite3ErrName(int); #endif |