diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2010-08-25 22:49:52 +0200 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2010-08-25 22:49:52 +0200 |
| commit | e5a59eee5a0a090cd2cd6f87a63d076f851a7d86 (patch) | |
| tree | de6141a1c675c2d29ff9cf17e46276b823d7968d /client | |
| parent | 800feb16cb9e3fcb363f0856581c8822bd29d549 (diff) | |
| parent | 09c62e4ff81f0091608f67cf86ea219d40df4a1a (diff) | |
| download | mariadb-git-e5a59eee5a0a090cd2cd6f87a63d076f851a7d86.tar.gz | |
merge followup fix for 52301
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index f4fe149f5b5..c39ba4ff6ce 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -5220,8 +5220,10 @@ void do_connect(struct st_command *command) } #endif +#ifndef EMBEDDED_LIBRARY if (opt_protocol) mysql_options(&con_slot->mysql, MYSQL_OPT_PROTOCOL, (char*) &opt_protocol); +#endif #ifdef HAVE_SMEM if (con_shm) @@ -6179,8 +6181,10 @@ get_one_option(int optid, const struct my_option *opt, 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(); @@ -7932,8 +7936,10 @@ int main(int argc, char **argv) mysql_options(&con->mysql, MYSQL_SET_CHARSET_DIR, opt_charsets_dir); +#ifndef EMBEDDED_LIBRARY if (opt_protocol) mysql_options(&con->mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol); +#endif #ifdef HAVE_OPENSSL |