diff options
author | unknown <petr@mysql.com> | 2004-12-18 03:53:43 +0300 |
---|---|---|
committer | unknown <petr@mysql.com> | 2004-12-18 03:53:43 +0300 |
commit | 491baa972a2a2f373ae4dd3a1de2470169527326 (patch) | |
tree | d8d4592cf0dfa1a2181ba96de6ec1b0bfff82a60 /sql-common | |
parent | d9b8e4b84c0c377ac4cc7f6d762f304511a41868 (diff) | |
parent | 59b24f9f39ab0538da3b026ecfcba8bdcc0276fe (diff) | |
download | mariadb-git-491baa972a2a2f373ae4dd3a1de2470169527326.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
sql/mysqld.cc:
Auto merged
sql-common/client.c:
Auto merged
Diffstat (limited to 'sql-common')
-rw-r--r-- | sql-common/client.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 1a9bc4221a0..a014e398d8b 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -98,9 +98,6 @@ my_bool net_flush(NET *net); # include <sys/un.h> #endif -#ifndef INADDR_NONE -#define INADDR_NONE -1 -#endif #if defined(MSDOS) || defined(__WIN__) #define perror(A) #else |