diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-10-18 23:33:06 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-10-18 23:33:06 +0200 |
| commit | 68baf07dcd985376fae9d24c12ee0ff560b61e8f (patch) | |
| tree | 175f775e9847a50e7b51162573ae24f276abea96 /sql/mysqld.h | |
| parent | cbaf6e6b61241db6e97648c73dbeb0a15614a7aa (diff) | |
| parent | 362c2bca3e170031d33622f27d978c9570d0a9f5 (diff) | |
| download | mariadb-git-68baf07dcd985376fae9d24c12ee0ff560b61e8f.tar.gz | |
5.3 merge
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index 619f30ce683..554c662e90f 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -368,19 +368,23 @@ enum options_mysqld OPT_BINLOG_FORMAT, OPT_BINLOG_IGNORE_DB, OPT_BIN_LOG, - OPT_LOG_BASENAME, OPT_BOOTSTRAP, OPT_CONSOLE, OPT_DEBUG_SYNC_TIMEOUT, OPT_DELAY_KEY_WRITE_ALL, OPT_DEPRECATED_OPTION, + OPT_ENGINE_CONDITION_PUSHDOWN, + OPT_IGNORE_DB_DIRECTORY, OPT_ISAM_LOG, OPT_KEY_BUFFER_SIZE, OPT_KEY_CACHE_AGE_THRESHOLD, OPT_KEY_CACHE_BLOCK_SIZE, OPT_KEY_CACHE_DIVISION_LIMIT, OPT_KEY_CACHE_PARTITIONS, + OPT_LOG_BASENAME, + OPT_LOG_ERROR, OPT_LOWER_CASE_TABLE_NAMES, + OPT_MAX_LONG_DATA_SIZE, OPT_ONE_THREAD, OPT_POOL_OF_THREADS, OPT_REPLICATE_DO_DB, @@ -406,9 +410,7 @@ enum options_mysqld OPT_SSL_KEY, OPT_UPDATE_LOG, OPT_WANT_CORE, - OPT_ENGINE_CONDITION_PUSHDOWN, - OPT_LOG_ERROR, - OPT_MAX_LONG_DATA_SIZE + OPT_which_is_always_the_last }; #endif |