From a22b5651fd18da897da322b4081fa05dffaee328 Mon Sep 17 00:00:00 2001
From: Bjorn Munch <bjorn.munch@oracle.com>
Date: Wed, 25 Aug 2010 10:23:19 +0200
Subject: [PATCH] Bug #52301 Add --protocol to mysqltest Added code resulted in
 strange linking problem for embedded on Windows Avoided by not doing this for
 embedded mode It's irrelevant for embedded server anyway, --protocol will be
 ignored

---
 client/mysqltest.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index d7a302912b4..756208a0f96 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