diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-08-26 16:36:48 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-08-26 16:36:48 +0400 |
| commit | 27d5b6e57fa9f78773002a3b6ae37cfb23b37547 (patch) | |
| tree | b8d0085ad17c77e369ac166492efbb6f54155701 /client | |
| parent | e7b268827130b6bc5fa6c2c0f90a850ee309668c (diff) | |
| parent | d1fb4ba2995b3a0364d1a7bca21a20a203b5bfa1 (diff) | |
| download | mariadb-git-27d5b6e57fa9f78773002a3b6ae37cfb23b37547.tar.gz | |
Automerge.
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 f4fe149f5b5..c39ba4ff6ce 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 |