diff options
| author | unknown <monty@narttu.mysql.fi> | 2007-03-24 11:06:09 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2007-03-24 11:06:09 +0200 |
| commit | e2a3fdd1fe463a58a733726973d59d247ad8853e (patch) | |
| tree | 9da46d5da168cf6be98e5d92f1946ee853a76ea4 /client/mysqlbinlog.cc | |
| parent | 212ecf348cbb43f71cfd14a51ca19b7ef987859f (diff) | |
| parent | c59dba87b64179fdaca7519f1433f0547cdcbb68 (diff) | |
| download | mariadb-git-e2a3fdd1fe463a58a733726973d59d247ad8853e.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into mysql.com:/home/my/mysql-5.1
client/mysqladmin.cc:
Auto merged
client/mysqlbinlog.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_view.cc:
Auto merged
Diffstat (limited to 'client/mysqlbinlog.cc')
| -rw-r--r-- | client/mysqlbinlog.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 0835e59d547..6a61e010d6e 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -946,14 +946,9 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), remote_opt= 1; break; case OPT_MYSQL_PROTOCOL: - { - if ((opt_protocol= find_type(argument, &sql_protocol_typelib,0)) <= 0) - { - fprintf(stderr, "Unknown option to protocol: %s\n", argument); - exit(1); - } + opt_protocol= find_type_or_exit(argument, &sql_protocol_typelib, + opt->name); break; - } case OPT_START_DATETIME: start_datetime= convert_str_to_timestamp(start_datetime_str); break; |