Commit e5a59eee authored by Bjorn Munch's avatar Bjorn Munch

merge followup fix for 52301

parents 800feb16 09c62e4f
...@@ -5220,8 +5220,10 @@ void do_connect(struct st_command *command) ...@@ -5220,8 +5220,10 @@ void do_connect(struct st_command *command)
} }
#endif #endif
#ifndef EMBEDDED_LIBRARY
if (opt_protocol) if (opt_protocol)
mysql_options(&con_slot->mysql, MYSQL_OPT_PROTOCOL, (char*) &opt_protocol); mysql_options(&con_slot->mysql, MYSQL_OPT_PROTOCOL, (char*) &opt_protocol);
#endif
#ifdef HAVE_SMEM #ifdef HAVE_SMEM
if (con_shm) if (con_shm)
...@@ -6179,8 +6181,10 @@ get_one_option(int optid, const struct my_option *opt, ...@@ -6179,8 +6181,10 @@ get_one_option(int optid, const struct my_option *opt,
print_version(); print_version();
exit(0); exit(0);
case OPT_MYSQL_PROTOCOL: case OPT_MYSQL_PROTOCOL:
#ifndef EMBEDDED_LIBRARY
opt_protocol= find_type_or_exit(argument, &sql_protocol_typelib, opt_protocol= find_type_or_exit(argument, &sql_protocol_typelib,
opt->name); opt->name);
#endif
break; break;
case '?': case '?':
usage(); usage();
...@@ -7932,8 +7936,10 @@ int main(int argc, char **argv) ...@@ -7932,8 +7936,10 @@ int main(int argc, char **argv)
mysql_options(&con->mysql, MYSQL_SET_CHARSET_DIR, mysql_options(&con->mysql, MYSQL_SET_CHARSET_DIR,
opt_charsets_dir); opt_charsets_dir);
#ifndef EMBEDDED_LIBRARY
if (opt_protocol) if (opt_protocol)
mysql_options(&con->mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol); mysql_options(&con->mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);
#endif
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment