diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-06-20 12:31:17 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-06-20 12:31:17 +0300 |
| commit | 8baf9b0c469e2845d15cc1181bc6b101cdfba087 (patch) | |
| tree | f5808173b56692f71874213639401af1e18cb146 /sql/sql_priv.h | |
| parent | 5e4f4ec8211b61e71ec29069161d0f41f4c05376 (diff) | |
| parent | ded614d7dbc930e373d1a69a0d2a7e4bf0a2c6d3 (diff) | |
| download | mariadb-git-8baf9b0c469e2845d15cc1181bc6b101cdfba087.tar.gz | |
Merge remote-tracking branch '5.5' into 10.0
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 09a22ba0444..2c9a22d4bd9 100644 --- a/sql/sql_priv.h +++ b/sql/sql_priv.h @@ -121,7 +121,7 @@ #define OPTION_AUTOCOMMIT (1ULL << 8) // THD, user #define OPTION_BIG_SELECTS (1ULL << 9) // THD, user #define OPTION_LOG_OFF (1ULL << 10) // THD, user -#define OPTION_QUOTE_SHOW_CREATE (1ULL << 11) // THD, user, unused +#define OPTION_QUOTE_SHOW_CREATE (1ULL << 11) // THD, user #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 |