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/repl_failsafe.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/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 855520fb2e4..a30776057b1 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -163,7 +163,7 @@ int register_slave(THD* thd, uchar* packet, uint packet_length) SLAVE_INFO *si; uchar *p= packet, *p_end= packet + packet_length; - if (check_access(thd, REPL_SLAVE_ACL, any_db,0,0,0)) + if (check_access(thd, REPL_SLAVE_ACL, any_db,0,0,0,0)) return 1; if (!(si = (SLAVE_INFO*)my_malloc(sizeof(SLAVE_INFO), MYF(MY_WME)))) goto err2; |