diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-12 16:14:31 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-12 16:14:31 +0200 |
| commit | e4505279388e3c1e84937b6737bf5619a15a7d4c (patch) | |
| tree | f83ddf88057c0310d58596a499b9b3b1b76bed1b /sql/sql_priv.h | |
| parent | 6d68a3464e9a93baecc277a2c270cad28fbf50bd (diff) | |
| parent | 69b33fca8cce0912b7fecc79cbef895a119f3017 (diff) | |
| download | mariadb-git-e4505279388e3c1e84937b6737bf5619a15a7d4c.tar.gz | |
Merge 10.3 into 10.4
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 3744dfce770..25384527c10 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 |