diff options
| author | unknown <jcole@tetra.spaceapes.com> | 2001-01-27 03:27:40 -0600 |
|---|---|---|
| committer | unknown <jcole@tetra.spaceapes.com> | 2001-01-27 03:27:40 -0600 |
| commit | 63950c58419efa309a05e42972c4381e57650d67 (patch) | |
| tree | f6bda9d9ef97783aa278a34c9482e07a13bc2995 /client | |
| parent | 70e783fa2e22e03f3ffd59038ceb26fcef577f68 (diff) | |
| parent | 882f16d0369b4cd0742ac37650a71fc6f3b00a57 (diff) | |
| download | mariadb-git-63950c58419efa309a05e42972c4381e57650d67.tar.gz | |
manual merge
sql/mysqld.cc:
Auto merged
client/mysqltest.c:
Auto merged
Docs/manual.texi:
merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 4 | ||||
| -rw-r--r-- | client/mysqladmin.c | 4 | ||||
| -rw-r--r-- | client/mysqldump.c | 4 | ||||
| -rw-r--r-- | client/mysqlshow.c | 4 | ||||
| -rw-r--r-- | client/mysqltest.c | 4 |
5 files changed, 20 insertions, 0 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index d0300344ba4..11bf5640020 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -692,6 +692,10 @@ static int get_options(int argc, char **argv) skip_column_names=1; break; case 'P': + if(!current_host) { + my_free(current_host, MYF(MY_ALLOW_ZERO_PTR)); + current_host=my_strdup("127.0.0.1", MYF(MY_WME)); + }; opt_mysql_port= (unsigned int) atoi(optarg); break; case 'S': diff --git a/client/mysqladmin.c b/client/mysqladmin.c index 2a9d47edf44..b17559aafd6 100644 --- a/client/mysqladmin.c +++ b/client/mysqladmin.c @@ -185,6 +185,10 @@ int main(int argc,char *argv[]) interval=atoi(optarg); break; case 'P': + if(!host) { + my_free(host, MYF(MY_ALLOW_ZERO_PTR)); + host=my_strdup("127.0.0.1", MYF(MY_WME)); + }; tcp_port= (unsigned int) atoi(optarg); break; case 'r': diff --git a/client/mysqldump.c b/client/mysqldump.c index efb632cf5e4..c5ae758541c 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -344,6 +344,10 @@ static int get_options(int *argc,char ***argv) tty_password=1; break; case 'P': + if(!current_host) { + my_free(current_host, MYF(MY_ALLOW_ZERO_PTR)); + current_host=my_strdup("127.0.0.1", MYF(MY_WME)); + }; opt_mysql_port= (unsigned int) atoi(optarg); break; case 'S': diff --git a/client/mysqlshow.c b/client/mysqlshow.c index 8fffe02a52f..f341108d8d4 100644 --- a/client/mysqlshow.c +++ b/client/mysqlshow.c @@ -238,6 +238,10 @@ get_options(int *argc,char ***argv) break; #endif case 'P': + if(!host) { + my_free(host, MYF(MY_ALLOW_ZERO_PTR)); + host=my_strdup("127.0.0.1", MYF(MY_WME)); + }; opt_mysql_port= (unsigned int) atoi(optarg); break; case 'S': diff --git a/client/mysqltest.c b/client/mysqltest.c index 953f770240b..7c708254f1c 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -1154,6 +1154,10 @@ int parse_args(int argc, char **argv) tty_password=1; break; case 'P': + if(!host) { + my_free(host, MYF(MY_ALLOW_ZERO_PTR)); + host=my_strdup("127.0.0.1", MYF(MY_WME)); + }; port = atoi(optarg); break; case 'S': |