summaryrefslogtreecommitdiff
path: root/client/client_priv.h
diff options
context:
space:
mode:
authorjani@ua141d10.elisa.omakaista.fi <>2007-04-10 16:28:47 +0300
committerjani@ua141d10.elisa.omakaista.fi <>2007-04-10 16:28:47 +0300
commitb4ba815967104d2884717fb727584788e018c879 (patch)
treecae620a49c973ba2cfe8c707254295e28815efcc /client/client_priv.h
parent26d2908c70a259561d307e54f1b1320bb640bd00 (diff)
parentfb4e9b006ef5b6a3dbfd00fe47155fb4b1590ad7 (diff)
downloadmariadb-git-b4ba815967104d2884717fb727584788e018c879.tar.gz
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
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 9a678eb7d2a..ddc0e50b723 100644
--- a/client/client_priv.h
+++ b/client/client_priv.h
@@ -67,5 +67,5 @@ enum options_client
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_WRITE_BINLOG
+ OPT_DEBUG_INFO, OPT_COLUMN_TYPES, OPT_ERROR_LOG_FILE, OPT_WRITE_BINLOG
};