diff options
| author | unknown <gluh@mysql.com/eagle.(none)> | 2007-10-04 15:35:45 +0500 |
|---|---|---|
| committer | unknown <gluh@mysql.com/eagle.(none)> | 2007-10-04 15:35:45 +0500 |
| commit | fdf3c175343832393c00a744431450ce754744b5 (patch) | |
| tree | 9ee66e361aa2378fc85a60f4b11f4618c822e491 /client | |
| parent | 4e15adf822090e226414904152d6e17a14288940 (diff) | |
| download | mariadb-git-fdf3c175343832393c00a744431450ce754744b5.tar.gz | |
after merge fix
Diffstat (limited to 'client')
| -rw-r--r-- | client/client_priv.h | 5 | ||||
| -rw-r--r-- | client/mysqldump.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/client/client_priv.h b/client/client_priv.h index 1414de2aa67..c205d07c34c 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -80,7 +80,6 @@ enum options_client 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_DEBUG_CHECK, OPT_COLUMN_TYPES, OPT_ERROR_LOG_FILE, - OPT_WRITE_BINLOG, OPT_MAX_CLIENT_OPTION, - OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_SSL_VERIFY_SERVER_CERT, - OPT_DEBUG_INFO, OPT_ERROR_LOG_FILE, OPT_DUMP_DATE + OPT_WRITE_BINLOG, OPT_DUMP_DATE, + OPT_MAX_CLIENT_OPTION }; diff --git a/client/mysqldump.c b/client/mysqldump.c index 03265fbf5a3..2b463552dd5 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -425,7 +425,7 @@ static struct my_option my_long_options[] = (uchar**) &opt_single_transaction, (uchar**) &opt_single_transaction, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, {"dump-date", OPT_DUMP_DATE, "Put a dump date to the end of the output.", - (gptr*) &opt_dump_date, (gptr*) &opt_dump_date, 0, + (uchar**) &opt_dump_date, (uchar**) &opt_dump_date, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, {"skip-opt", OPT_SKIP_OPTIMIZATION, "Disable --opt. Disables --add-drop-table, --add-locks, --create-options, --quick, --extended-insert, --lock-tables, --set-charset, and --disable-keys.", |