diff options
| author | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-11-08 08:54:19 +0100 |
|---|---|---|
| committer | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-11-08 08:54:19 +0100 |
| commit | 10397af9c519b8238599a1ff9fed0d3e871c50e7 (patch) | |
| tree | 0829eb1d0574e5ef45d0fde980cee5ae7110bc07 /sql/sql_binlog.cc | |
| parent | af48b26ed8b369e80968df581cf395c572d35be2 (diff) | |
| parent | cda4afc2bfbd508ab189eedb1c0dfbe4861533b4 (diff) | |
| download | mariadb-git-10397af9c519b8238599a1ff9fed0d3e871c50e7.tar.gz | |
Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1
into kindahl-laptop.dnsalias.net:/home/bk/b31611-mysql-5.1-target-5.1.22
sql/sql_binlog.cc:
Auto merged
Diffstat (limited to 'sql/sql_binlog.cc')
| -rw-r--r-- | sql/sql_binlog.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_binlog.cc b/sql/sql_binlog.cc index a3a804db8f0..fa6aa8f5881 100644 --- a/sql/sql_binlog.cc +++ b/sql/sql_binlog.cc @@ -37,6 +37,9 @@ void mysql_client_binlog_statement(THD* thd) thd->lex->comment.length : 2048), thd->lex->comment.str)); + if (check_global_access(thd, SUPER_ACL)) + DBUG_VOID_RETURN; + /* Temporarily turn off send_ok, since different events handle this differently |