diff options
| author | unknown <serg@serg.mylan> | 2003-12-09 20:50:11 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-12-09 20:50:11 +0100 |
| commit | 6f1d63bfe0f7166709061c6f6ad07d00164ce6d8 (patch) | |
| tree | b8ee45262e3da0469b0169121bfbcb03b67c6557 /sql/mysqld.cc | |
| parent | 4e85bf326e8051533bb680d1a612813705dc789d (diff) | |
| parent | 7cfbf9e8f681eac207f8b37d12780f73ffa5dd70 (diff) | |
| download | mariadb-git-6f1d63bfe0f7166709061c6f6ad07d00164ce6d8.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 70ee2f632ca..410a1644eec 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4634,14 +4634,14 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), my_use_symdir=0; break; case (int) OPT_BIND_ADDRESS: - if (argument && isdigit(argument[0])) + if (isdigit(argument[0])) { my_bind_addr = (ulong) inet_addr(argument); } else { struct hostent *ent; - if (argument || argument[0]) + if (argument[0]) ent=gethostbyname(argument); else { |