diff options
| author | unknown <tulin@dl145c.mysql.com> | 2005-09-14 13:37:52 +0200 |
|---|---|---|
| committer | unknown <tulin@dl145c.mysql.com> | 2005-09-14 13:37:52 +0200 |
| commit | 469d7c12b804c0e29de14356b75066c58b005c76 (patch) | |
| tree | 07c0b532d9d3d9f16c7b279334a18dad3b2e7292 /sql/sql_repl.cc | |
| parent | 59e6d10603ee77b053171832a9146010884b921d (diff) | |
| parent | 258c9e9dc7d7aa35a4f56d182761fb356946e5d0 (diff) | |
| download | mariadb-git-469d7c12b804c0e29de14356b75066c58b005c76.tar.gz | |
merge
sql/mysql_priv.h:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index d376423e990..28b0ae8c78e 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -770,7 +770,7 @@ int start_slave(THD* thd , MASTER_INFO* mi, bool net_report) int thread_mask; DBUG_ENTER("start_slave"); - if (check_access(thd, SUPER_ACL, any_db,0,0,0)) + if (check_access(thd, SUPER_ACL, any_db,0,0,0,0)) DBUG_RETURN(1); lock_slave_threads(mi); // this allows us to cleanly read slave_running // Get a mask of _stopped_ threads @@ -895,7 +895,7 @@ int stop_slave(THD* thd, MASTER_INFO* mi, bool net_report ) if (!thd) thd = current_thd; - if (check_access(thd, SUPER_ACL, any_db,0,0,0)) + if (check_access(thd, SUPER_ACL, any_db,0,0,0,0)) return 1; thd->proc_info = "Killing slave"; int thread_mask; |