diff options
| author | unknown <hf@deer.(none)> | 2003-09-26 15:40:26 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-09-26 15:40:26 +0500 |
| commit | dbb9596727c043805790c9cc24cc8726569d723e (patch) | |
| tree | b80c6147c3a9929ec4e00bac55883c6d575ac2a4 /sql/repl_failsafe.cc | |
| parent | 23dfae40f6b0c0a0d873a248b6a3428b3b6d7cae (diff) | |
| parent | 1705369809aaa17407ce0bd25fdd15607cdf32b0 (diff) | |
| download | mariadb-git-dbb9596727c043805790c9cc24cc8726569d723e.tar.gz | |
Merge
include/mysql.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_derived.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_show.cc:
Auto merged
libmysqld/lib_sql.cc:
SCCS merged
libmysqld/libmysqld.c:
SCCS merged
sql/sql_parse.cc:
SCCS merged
Diffstat (limited to 'sql/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 78fee1d8b19..7c943d4ae53 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -153,9 +153,8 @@ 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)) + if (check_access(thd, REPL_SLAVE_ACL, any_db,0,0,0)) return 1; - if (!(si = (SLAVE_INFO*)my_malloc(sizeof(SLAVE_INFO), MYF(MY_WME)))) goto err2; |