diff options
| author | Sergey Vojtovich <svoj@sun.com> | 2010-08-27 15:33:32 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@sun.com> | 2010-08-27 15:33:32 +0400 |
| commit | ab2414577a342ed89abee2d156fcb55d33af5d84 (patch) | |
| tree | 014a8372f0e90481bc196423eb9088c643bb20e4 /client | |
| parent | c88cfec29cdb47bbc76afd0c027d0fcce2109961 (diff) | |
| parent | 1087cfc4d5f616f386d7d2b4f912bac358a05517 (diff) | |
| download | mariadb-git-ab2414577a342ed89abee2d156fcb55d33af5d84.tar.gz | |
Merge 5.1-bugteam to 5.5-merge.
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 6c8f1ee3561..5d173ccd8c0 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -6228,8 +6228,10 @@ get_one_option(int optid, const struct my_option *opt, char *argument) print_version(); exit(0); case OPT_MYSQL_PROTOCOL: +#ifndef EMBEDDED_LIBRARY opt_protocol= find_type_or_exit(argument, &sql_protocol_typelib, opt->name); +#endif break; case '?': usage(); |