summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorBjorn Munch <bjorn.munch@oracle.com>2010-08-26 15:14:50 +0200
committerBjorn Munch <bjorn.munch@oracle.com>2010-08-26 15:14:50 +0200
commita4154bd0a04ee863c07848e77ee727b4dc8244e8 (patch)
treead0f7aeb15ba062db3f9d26537d51a8ee273ddd7 /client
parent27d5b6e57fa9f78773002a3b6ae37cfb23b37547 (diff)
downloadmariadb-git-a4154bd0a04ee863c07848e77ee727b4dc8244e8.tar.gz
Reduced #ifndef for 52301, caused compile warning
Diffstat (limited to 'client')
-rw-r--r--client/mysqltest.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index c39ba4ff6ce..07eb66bc2b8 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -5220,10 +5220,8 @@ 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)
@@ -7936,10 +7934,8 @@ 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