From 76907f8591d1c8d1fa91eca388304b3fb4d7d4c8 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 1/2] 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
 

From 09c62e4ff81f0091608f67cf86ea219d40df4a1a Mon Sep 17 00:00:00 2001
From: Bjorn Munch <bjorn.munch@oracle.com>
Date: Wed, 25 Aug 2010 16:34:31 +0200
Subject: [PATCH 2/2] Cherry pick 55501

---
 mysql-test/include/have_innodb_plugin.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/include/have_innodb_plugin.inc b/mysql-test/include/have_innodb_plugin.inc
index 99a79465f52..df876deb2d7 100644
--- a/mysql-test/include/have_innodb_plugin.inc
+++ b/mysql-test/include/have_innodb_plugin.inc
@@ -1,3 +1,4 @@
+--source include/not_embedded.inc
 disable_query_log;
 --require r/true.require
 SELECT (plugin_library LIKE 'ha_innodb_plugin%') AS `TRUE` FROM information_schema.plugins WHERE LOWER(plugin_name) = 'innodb' AND LOWER(plugin_status) = 'active';