diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-08-08 12:32:34 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-08-08 12:32:34 +0200 |
| commit | 704898bf3200af4da42c1bf9251a7da5533db73f (patch) | |
| tree | 8f87d8216530959492e37976f6aca4cdcfa53645 /client/mysqltest.cc | |
| parent | 1877016c39c6f4f20003cdcb6cb8dbd68abd77ef (diff) | |
| download | mariadb-git-704898bf3200af4da42c1bf9251a7da5533db73f.tar.gz | |
undo the fix for MySQL Bug#12998841
Diffstat (limited to 'client/mysqltest.cc')
| -rw-r--r-- | client/mysqltest.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 34d8edcbe0b..b1784fdc7b6 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -5456,7 +5456,7 @@ void do_connect(struct st_command *command) int con_port= opt_port; char *con_options; my_bool con_ssl= 0, con_compress= 0; - my_bool con_pipe= 0, con_shm= 0, con_cleartext_enable= 0; + my_bool con_pipe= 0, con_shm= 0; struct st_connection* con_slot; static DYNAMIC_STRING ds_connection_name; @@ -5546,8 +5546,6 @@ void do_connect(struct st_command *command) con_pipe= 1; else if (!strncmp(con_options, "SHM", 3)) con_shm= 1; - else if (!strncmp(con_options, "CLEARTEXT", 9)) - con_cleartext_enable= 1; else die("Illegal option to connect: %.*s", (int) (end - con_options), con_options); @@ -5644,10 +5642,6 @@ void do_connect(struct st_command *command) if (ds_default_auth.length) mysql_options(&con_slot->mysql, MYSQL_DEFAULT_AUTH, ds_default_auth.str); - - if (con_cleartext_enable) - mysql_options(&con_slot->mysql, MYSQL_ENABLE_CLEARTEXT_PLUGIN, - (char*) &con_cleartext_enable); /* Special database to allow one to connect without a database name */ if (ds_database.length && !strcmp(ds_database.str,"*NO-ONE*")) dynstr_set(&ds_database, ""); |