diff options
| author | unknown <guilhem@mysql.com> | 2003-10-09 00:08:09 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2003-10-09 00:08:09 +0200 |
| commit | 25363c8144d0bd57378bb93397c6183cca7c3d94 (patch) | |
| tree | 5591b2a38762bf396c77410d93d1d2dff7ad9b04 | |
| parent | a7a7a8cacd3e81432c6dc5df9959d732de4d5804 (diff) | |
| parent | 21713178b64a19808e70fed3acf8123208d60e8a (diff) | |
| download | mariadb-git-25363c8144d0bd57378bb93397c6183cca7c3d94.tar.gz | |
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
| -rw-r--r-- | VC++Files/mysqlshutdown/MYSQL.ICO | bin | 318 -> 0 bytes | |||
| -rw-r--r-- | sql/mysqld.cc | 7 |
2 files changed, 6 insertions, 1 deletions
diff --git a/VC++Files/mysqlshutdown/MYSQL.ICO b/VC++Files/mysqlshutdown/MYSQL.ICO Binary files differdeleted file mode 100644 index 1fe0b7115bb..00000000000 --- a/VC++Files/mysqlshutdown/MYSQL.ICO +++ /dev/null diff --git a/sql/mysqld.cc b/sql/mysqld.cc index c6af4ad5c12..1c26d4a8b7c 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -53,6 +53,10 @@ #define IF_PURIFY(A,B) (B) #endif +#ifndef INADDR_NONE +#define INADDR_NONE -1 // Error value from inet_addr +#endif + /* stack traces are only supported on linux intel */ #if defined(__linux__) && defined(__i386__) && defined(USE_PSTACK) #define HAVE_STACK_TRACE_ON_SEGV @@ -5214,7 +5218,8 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), my_use_symdir=0; break; case (int) OPT_BIND_ADDRESS: - if (!argument || (my_bind_addr= (ulong) inet_addr(argument)) == INADDR_NONE) + if (!argument || + (my_bind_addr= (ulong) inet_addr(argument)) == INADDR_NONE) { struct hostent *ent; if (argument || argument[0]) |