diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2010-11-14 12:23:51 +0100 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2010-11-14 12:23:51 +0100 |
| commit | dbbb506f4226e30255b8f4463163d4f6d39400fc (patch) | |
| tree | 5124a2f3726a037c771699c00f1c6e132b9653db /client | |
| parent | 866cec611a369be344bafed0d4691ad6b83e4086 (diff) | |
| parent | ec830356d78a8ca99a6397e95f3cf70493556257 (diff) | |
| download | mariadb-git-dbbb506f4226e30255b8f4463163d4f6d39400fc.tar.gz | |
merge from 5.1 up to rev 3471
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 de46624bf2c..abedd874948 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -5278,10 +5278,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) @@ -8002,10 +8000,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 #ifdef HAVE_OPENSSL |