diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2010-09-01 15:49:43 +0200 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2010-09-01 15:49:43 +0200 |
| commit | 71c0fde0975f262e729d0b4d084b14920c3e975d (patch) | |
| tree | a0bd3f71fa30f2c02ec4d33b4d66656952002911 /client | |
| parent | 1f95aa82f1d1df134e9f900612d3588be259e16c (diff) | |
| parent | 7bd808548ee52e597cb444a2ef36c593d81fce0b (diff) | |
| download | mariadb-git-71c0fde0975f262e729d0b4d084b14920c3e975d.tar.gz | |
merge from 5.5
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index b0e9a3d00be..d96ac057a50 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -5255,10 +5255,8 @@ 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) @@ -7992,10 +7990,8 @@ 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 #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) |