diff options
| author | drh <drh@noemail.net> | 2014-12-04 23:35:08 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-12-04 23:35:08 +0000 |
| commit | 34794c3d0cd985100f5fe3f4ff8e6ffa9ffa18da (patch) | |
| tree | 39986308fca5eaa2515c2dcaa2a92dc76fbb3133 /src/sqliteInt.h | |
| parent | 6e09b16852d92fa44582ca69882f2f2b6501cd51 (diff) | |
| parent | dea7d70d1b9516956a7550d0ffde1b4560fc77ca (diff) | |
| download | sqlite-34794c3d0cd985100f5fe3f4ff8e6ffa9ffa18da.tar.gz sqlite-34794c3d0cd985100f5fe3f4ff8e6ffa9ffa18da.zip | |
Incorporate the SQLITE_CHECKPOINT_TRUNCATE enhancement and a couple of
obscure bug fixes from trunk.
FossilOrigin-Name: 34ffa3b3c002b0e87d8382ad76e87dbaec0b2bc6
Diffstat (limited to 'src/sqliteInt.h')
| -rw-r--r-- | src/sqliteInt.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 8824e3129..2b300f8e3 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -2023,7 +2023,7 @@ struct Expr { /* ** The following are the meanings of bits in the Expr.flags field. */ -#define EP_FromJoin 0x000001 /* Originated in ON or USING clause of a join */ +#define EP_FromJoin 0x000001 /* Originates in ON/USING clause of outer join */ #define EP_Agg 0x000002 /* Contains one or more aggregate functions */ #define EP_Resolved 0x000004 /* IDs have been resolved to COLUMNs */ #define EP_Error 0x000008 /* Expression contains one or more errors */ @@ -2043,6 +2043,7 @@ struct Expr { #define EP_NoReduce 0x020000 /* Cannot EXPRDUP_REDUCE this Expr */ #define EP_Unlikely 0x040000 /* unlikely() or likelihood() function */ #define EP_Constant 0x080000 /* Node is a constant */ +#define EP_CanBeNull 0x100000 /* Can be null despite NOT NULL constraint */ /* ** These macros can be used to test, set, or clear bits in the |