bzr commit into mysql-5.1-mtr branch (bjorn.munch:2924) Bug#52301

[Bjorn Munch]

#At file:///home/bm136801/my/embprot-51/ based on revid:bjorn.bunch@stripped

 2924 Bjorn Munch	2010-08-25
      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

    modified:
      client/mysqltest.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-08-04 10:19:51 +0000
+++ b/client/mysqltest.cc	2010-08-25 08:23:19 +0000
@@ -5220,8 +5220,10 @@ void do_connect(struct st_command *comma
   }
 #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 m
     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
 


Attachment: [text/bzr-bundle] bzr/[e-mail]