diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2008-01-31 17:46:50 +0100 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2008-01-31 17:46:50 +0100 |
| commit | a36faa7edaec89c22a5d449a927bf9c11f2fbfde (patch) | |
| tree | c327f90b44e25f92a820d5886ba6220cf6d9c2c8 /client/client_priv.h | |
| parent | 4bacd53715ac860c6ba2d9c148f87d22cae9c62a (diff) | |
| parent | 681bf14ea7a6fedb55d6e59a414d876d4d5f7313 (diff) | |
| download | mariadb-git-a36faa7edaec89c22a5d449a927bf9c11f2fbfde.tar.gz | |
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
client/client_priv.h:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/suite/rpl/t/rpl_err_ignoredtable.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_view.cc:
Auto merged
mysql-test/suite/rpl/r/rpl_invoked_features.result:
Manual merge.
mysql-test/suite/rpl/t/rpl_invoked_features.test:
Manual merge.
sql/log.cc:
Manual merge.
Diffstat (limited to 'client/client_priv.h')
| -rw-r--r-- | client/client_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/client_priv.h b/client/client_priv.h index 71d6ce8a635..06145232995 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -76,7 +76,7 @@ enum options_client OPT_SLAP_POST_SYSTEM, OPT_SLAP_COMMIT, OPT_SLAP_DETACH, - OPT_MYSQL_REPLACE_INTO, OPT_BASE64_OUTPUT, OPT_SERVER_ID, + OPT_MYSQL_REPLACE_INTO, OPT_BASE64_OUTPUT_MODE, 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_DUMP_DATE, |