Skip to content

M
mariadb
Commit a4154bd0 authored by Bjorn Munch's avatar Bjorn Munch
Browse files
Options

Reduced #ifndef for 52301, caused compile warning

parent 27d5b6e5
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
client/mysqltest.cc
View file @ a4154bd0
...@@ -5220,10 +5220,8 @@ void do_connect(struct st_command *command) ...@@ -5220,10 +5220,8 @@ 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)
...@@ -7936,10 +7934,8 @@ int main(int argc, char **argv) ...@@ -7936,10 +7934,8 @@ 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7