diff options
| author | kent@mysql.com <> | 2006-04-21 20:04:13 +0200 |
|---|---|---|
| committer | kent@mysql.com <> | 2006-04-21 20:04:13 +0200 |
| commit | 1472ed2061ad2e0d7db35c6d54af3259f7e10917 (patch) | |
| tree | 3ed0f0d189da816f92a35b7853c32fa3c3433546 /client | |
| parent | 4b21910b0d3570867dbce473c4d8bbd7454d4423 (diff) | |
| parent | 8c420e29eb5fc92089c787c245a14407f8e1ca61 (diff) | |
| download | mariadb-git-1472ed2061ad2e0d7db35c6d54af3259f7e10917.tar.gz | |
Merge
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 8589bdb05ed..12c86e02dc4 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -653,7 +653,7 @@ static struct my_option my_long_options[] = "Base name of shared memory.", (gptr*) &shared_memory_base_name, (gptr*) &shared_memory_base_name, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, #endif - {"socket", 'S', "Socket file to use for connection. (This will override --port unless --protocol=TCP is specified.)", + {"socket", 'S', "Socket file to use for connection.", (gptr*) &opt_mysql_unix_port, (gptr*) &opt_mysql_unix_port, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, #include "sslopt-longopts.h" @@ -939,14 +939,7 @@ static int get_options(int argc, char **argv) opt_reconnect= 0; connect_flag= 0; /* Not in interactive mode */ } - - if (opt_mysql_port && (!opt_protocol) && (!opt_mysql_unix_port)) - { - /* Not checking return type since we are using a constant value */ - /* straight from the initialization of sql_protocol_typelib. */ - opt_protocol= find_type("TCP", &sql_protocol_typelib, 0); - } - + if (strcmp(default_charset, charset_info->csname) && !(charset_info= get_charset_by_csname(default_charset, MY_CS_PRIMARY, MYF(MY_WME)))) |