diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2010-08-25 10:23:19 +0200 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2010-08-25 10:23:19 +0200 |
| commit | 76907f8591d1c8d1fa91eca388304b3fb4d7d4c8 (patch) | |
| tree | 2c751da304db6d4bf6216c0a11a5593cfe7f3a9b /client | |
| parent | f3f5e04a366d970ab4b90860b83350fbed0951c6 (diff) | |
| download | mariadb-git-76907f8591d1c8d1fa91eca388304b3fb4d7d4c8.tar.gz | |
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
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 6 |
1 files changed, 6 insertions, 0 deletions
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 |