diff options
| author | unknown <jamppa@bk-internal.mysql.com> | 2007-03-29 16:11:29 +0200 |
|---|---|---|
| committer | unknown <jamppa@bk-internal.mysql.com> | 2007-03-29 16:11:29 +0200 |
| commit | 019446f059fd04b2cc237578b944481df0f72ffa (patch) | |
| tree | a5c6d6bb27fbcc3eee7a99ee1f8fe736e6c360e2 /client/client_priv.h | |
| parent | 940eb733f7f4bbfd117d56fcd3f7f03dfe8b8912 (diff) | |
| parent | f4422bd4a4e397d2c3271ad8417c277f0e7c0dbe (diff) | |
| download | mariadb-git-019446f059fd04b2cc237578b944481df0f72ffa.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
client/client_priv.h:
Auto merged
client/mysqlslap.c:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'client/client_priv.h')
| -rw-r--r-- | client/client_priv.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/client/client_priv.h b/client/client_priv.h index d5d8cb176ed..0923199ccd9 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -49,7 +49,6 @@ enum options_client OPT_TRIGGERS, OPT_MYSQL_ONLY_PRINT, OPT_MYSQL_LOCK_DIRECTORY, - OPT_MYSQL_SLAP_SLAVE, OPT_USE_THREADS, OPT_IMPORT_USE_THREADS, OPT_MYSQL_NUMBER_OF_QUERY, @@ -58,6 +57,14 @@ enum options_client OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_CREATE_SLAP_SCHEMA, OPT_SLAP_CSV, OPT_SLAP_CREATE_STRING, OPT_SLAP_AUTO_GENERATE_SQL_LOAD_TYPE, OPT_SLAP_AUTO_GENERATE_WRITE_NUM, + OPT_SLAP_AUTO_GENERATE_ADD_AUTO, + OPT_SLAP_AUTO_GENERATE_GUID_PRIMARY, + OPT_SLAP_AUTO_GENERATE_EXECUTE_QUERIES, + OPT_SLAP_AUTO_GENERATE_SECONDARY_INDEXES, + OPT_SLAP_AUTO_GENERATE_UNIQUE_WRITE_NUM, + OPT_SLAP_AUTO_GENERATE_UNIQUE_QUERY_NUM, + OPT_SLAP_PRE_QUERY, + OPT_SLAP_POST_QUERY, OPT_MYSQL_REPLACE_INTO, OPT_BASE64_OUTPUT, OPT_SERVER_ID, OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES, OPT_SSL_VERIFY_SERVER_CERT, OPT_DEBUG_INFO, OPT_COLUMN_TYPES, OPT_ERROR_LOG_FILE |