diff options
| author | unknown <serg@serg.mylan> | 2006-01-07 14:50:03 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2006-01-07 14:50:03 +0100 |
| commit | 4770190ab808b17c014d205a0320f4c42e93598e (patch) | |
| tree | a6b97cdc61401b4f6ed3844e3fb547844bfb11b1 /sql/mysqld.cc | |
| parent | 031ee043fb88f033c430df1c3c1890f8ea40d7e8 (diff) | |
| parent | d8dccc31058e8448e18981308395aac890cc4224 (diff) | |
| download | mariadb-git-4770190ab808b17c014d205a0320f4c42e93598e.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
sql/ha_innodb.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_show.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 f40f27d5a32..0e06351e892 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1490,7 +1490,7 @@ static void network_init(void) { if (((ret= bind(ip_sock, my_reinterpret_cast(struct sockaddr *) (&IPaddr), sizeof(IPaddr))) >= 0) || - (socket_errno != EADDRINUSE) || + (socket_errno != SOCKET_EADDRINUSE) || (waited >= mysqld_port_timeout)) break; sql_print_information("Retrying bind on TCP/IP port %u", mysqld_port); @@ -1702,7 +1702,7 @@ void end_thread(THD *thd, bool put_in_cache) wake_thread--; thd=thread_cache.get(); thd->real_id=pthread_self(); - thd->thread_stack= (char *) &thd; + thd->thread_stack= (char*) &thd; // For store_globals (void) thd->store_globals(); thd->thr_create_time= time(NULL); threads.append(thd); |