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/mysqlbinlog.cc | |
| 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/mysqlbinlog.cc')
| -rw-r--r-- | client/mysqlbinlog.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 7eb26d30cf9..ae482a155d5 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -67,7 +67,7 @@ static const char* database= 0; static my_bool force_opt= 0, short_form= 0, remote_opt= 0; static ulonglong offset = 0; static const char* host = 0; -static int port = MYSQL_PORT; +static int port= 0; static const char* sock= 0; static const char* user = 0; static char* pass = 0; @@ -688,7 +688,7 @@ static struct my_option my_long_options[] = {"password", 'p', "Password to connect to remote server.", 0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, {"port", 'P', "Use port to connect to the remote server.", - (gptr*) &port, (gptr*) &port, 0, GET_INT, REQUIRED_ARG, MYSQL_PORT, 0, 0, + (gptr*) &port, (gptr*) &port, 0, GET_INT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"position", 'j', "Deprecated. Use --start-position instead.", (gptr*) &start_position, (gptr*) &start_position, 0, GET_ULL, |