database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge bk-internal:/home/bk/mysql-5.1

Browse Source 
into  production.mysql.com:/usersnfs/mjorgensen/bktrees/mysql-5.1-build


sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
This commit is contained in:
unknown
2007-01-23 20:38:00 +01:00
parent f80084bff9 dd5523d997
commit ffb51e1592
7 changed files with 133 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/mysqld.cc
View File

@ -3698,15 +3698,18 @@ we force server id to 2, but this MySQL server will not act as a slave.");
mysqld_port,
MYSQL_COMPILATION_COMMENT);
// Signal threads waiting for server to be started
mysqld_server_started= 1;
pthread_cond_signal(&COND_server_started);
if (!opt_noacl)
{
if (Events::get_instance()->init())
unireg_abort(1);
}
/* Signal threads waiting for server to be started */
pthread_mutex_lock(&LOCK_server_started);
mysqld_server_started= 1;
pthread_cond_signal(&COND_server_started);
pthread_mutex_unlock(&LOCK_server_started);
#if defined(__NT__) || defined(HAVE_SMEM)
handle_connections_methods();
#else