diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-12 14:26:34 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-12 14:26:34 +0200 |
| commit | b32bc70e340b5b0d8fcb9aa48b1b875f3f2f12dc (patch) | |
| tree | 4edd8565c6eb0b1139cbb37c48f4d5f5a28798be /sql/sql_priv.h | |
| parent | f010c90807da68487b1ce4c952588c6c3def2afd (diff) | |
| parent | f72760df3390407c3cbe876e827818bc52849b71 (diff) | |
| download | mariadb-git-b32bc70e340b5b0d8fcb9aa48b1b875f3f2f12dc.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_priv.h')
| -rw-r--r-- | sql/sql_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_priv.h b/sql/sql_priv.h index e48b6195bb7..b179ae6ae40 100644 --- a/sql/sql_priv.h +++ b/sql/sql_priv.h @@ -126,7 +126,7 @@ #define TMP_TABLE_ALL_COLUMNS (1ULL << 12) // SELECT, intern #define OPTION_WARNINGS (1ULL << 13) // THD, user #define OPTION_AUTO_IS_NULL (1ULL << 14) // THD, user, binlog -#define OPTION_NO_CHECK_CONSTRAINT_CHECKS (1ULL << 14) +#define OPTION_NO_CHECK_CONSTRAINT_CHECKS (1ULL << 15) #define OPTION_SAFE_UPDATES (1ULL << 16) // THD, user #define OPTION_BUFFER_RESULT (1ULL << 17) // SELECT, user #define OPTION_BIN_LOG (1ULL << 18) // THD, user |