database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl

Browse Source 
into  quant.(none):/ext/mysql/bk/mysql-5.0-bug25306
This commit is contained in:
rafal@quant.(none)
2007-02-27 19:38:39 +01:00
parent d13c3b9456 d6e5e3d367
commit 235ca912d8
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_repl.cc
View File

@ -882,12 +882,14 @@ int start_slave(THD* thd , MASTER_INFO* mi, bool net_report)
int stop_slave(THD* thd, MASTER_INFO* mi, bool net_report )
{
DBUG_ENTER("stop_slave");
int slave_errno;
if (!thd)
thd = current_thd;
if (check_access(thd, SUPER_ACL, any_db,0,0,0,0))
return 1;
DBUG_RETURN(1);
thd->proc_info = "Killing slave";
int thread_mask;
lock_slave_threads(mi);
@ -921,12 +923,12 @@ int stop_slave(THD* thd, MASTER_INFO* mi, bool net_report )
{
if (net_report)
my_message(slave_errno, ER(slave_errno), MYF(0));
return 1;
DBUG_RETURN(1);
}
else if (net_report)
send_ok(thd);
return 0;
DBUG_RETURN(0);
}