diff options
| author | monty@narttu.mysql.fi <> | 2007-03-24 11:06:09 +0200 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2007-03-24 11:06:09 +0200 |
| commit | 28a05d3b33d21ed493bcb73bdf775f5377c3834a (patch) | |
| tree | 9da46d5da168cf6be98e5d92f1946ee853a76ea4 /client/mysqladmin.cc | |
| parent | 193360364703b5aeba78925aa5cdbf1f28a392c8 (diff) | |
| parent | 7e2fec44ae270693b5f48d3842056d3623e49b94 (diff) | |
| download | mariadb-git-28a05d3b33d21ed493bcb73bdf775f5377c3834a.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into mysql.com:/home/my/mysql-5.1
Diffstat (limited to 'client/mysqladmin.cc')
| -rw-r--r-- | client/mysqladmin.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc index cb704d716cc..03b37f2ba3a 100644 --- a/client/mysqladmin.cc +++ b/client/mysqladmin.cc @@ -287,15 +287,10 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), #endif 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; } - } if (error) { usage(); |