mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge gbichot@213.136.52.20:/home/bk/mysql-4.1

Browse source 
into mysql.com:/home/mysql_src/mysql-4.1
This commit is contained in:
guilhem@mysql.com 2003-10-09 00:08:09 +02:00
commit 44fc80c8a1
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
VC++Files/mysqlshutdown/MYSQL.ICO
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 318 B

7
sql/mysqld.cc
View file

@ -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])