summaryrefslogtreecommitdiff
path: root/client/client_priv.h
diff options
context:
space:
mode:
authormkindahl@dl145h.mysql.com <>2008-01-31 17:46:50 +0100
committermkindahl@dl145h.mysql.com <>2008-01-31 17:46:50 +0100
commit4c95b296140f08fcb3bf437c883de029e978fde4 (patch)
treec327f90b44e25f92a820d5886ba6220cf6d9c2c8 /client/client_priv.h
parentdbcd4d9ec854a6a7ce29e34e356f8bafbe4bd02a (diff)
parent2d9c3b715d6b80143b019e09c5d60fefe11352ec (diff)
downloadmariadb-git-4c95b296140f08fcb3bf437c883de029e978fde4.tar.gz
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
Diffstat (limited to 'client/client_priv.h')
-rw-r--r--client/client_priv.h2
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,