diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-06-21 16:19:43 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-06-21 16:19:43 +0300 |
| commit | 2e335a471ced0d86716f8c657f4d67f510712a30 (patch) | |
| tree | 6fa56f9d9083007e874449b9c2b27579f718ed94 /sql/sql_priv.h | |
| parent | 472c2d9b2fbb262665bdd08338ea902e8398010d (diff) | |
| parent | 8baf9b0c469e2845d15cc1181bc6b101cdfba087 (diff) | |
| download | mariadb-git-2e335a471ced0d86716f8c657f4d67f510712a30.tar.gz | |
Merge remote-tracking branch '10.0' into 10.1
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 def15060978..ef3dd68065a 100644 --- a/sql/sql_priv.h +++ b/sql/sql_priv.h @@ -122,7 +122,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 |