diff options
| author | unknown <jimw@mysql.com> | 2005-11-28 10:52:52 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-11-28 10:52:52 -0800 |
| commit | b34c9cfb0f231552ac94633d1522bfc5aed6330a (patch) | |
| tree | abc87ff21331c01b2982869378829ca175075bb5 /client/mysqlimport.c | |
| parent | 4b50aca58a855b5f8c5a5aa1636d43849def2c3f (diff) | |
| parent | a247d3a3b7f0ec777a1b03b95f4a0971d1c8118b (diff) | |
| download | mariadb-git-b34c9cfb0f231552ac94633d1522bfc5aed6330a.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-5792
into mysql.com:/home/jimw/my/mysql-5.0-clean
client/mysql.cc:
Auto merged
client/mysqladmin.cc:
Auto merged
client/mysqlbinlog.cc:
Auto merged
client/mysqlcheck.c:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqlimport.c:
Auto merged
client/mysqlshow.c:
Auto merged
client/mysqltest.c:
Auto merged
Diffstat (limited to 'client/mysqlimport.c')
| -rw-r--r-- | client/mysqlimport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqlimport.c b/client/mysqlimport.c index 958f987d16b..8694093f06b 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -121,7 +121,7 @@ static struct my_option my_long_options[] = NO_ARG, 0, 0, 0, 0, 0, 0}, #endif {"port", 'P', "Port number to use for connection.", (gptr*) &opt_mysql_port, - (gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, MYSQL_PORT, 0, 0, 0, 0, + (gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"protocol", OPT_MYSQL_PROTOCOL, "The protocol of connection (tcp,socket,pipe,memory).", 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, |