database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge with 4.0, mainly to get changes to windows project files

Browse Source
This commit is contained in:
monty@mysql.com
2004-05-20 00:54:52 +03:00
parent 332f124bc6 8e2ff7d135
commit a4b0ec1ede
81 changed files with 1576 additions and 1008 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/slave.cc
View File

@@ -167,13 +167,11 @@ int init_slave()
goto err;
}
/*
make sure slave thread gets started if server_id is set,
valid master.info is present, and master_host has not been specified
*/
if (server_id && !master_host && active_mi->host[0])
master_host= active_mi->host;
/* If server id is not set, start_slave_thread() will say it */
if (master_host && !opt_skip_slave_start)
{
if (start_slave_threads(1 /* need mutex */,