diff options
Diffstat (limited to 'sql/sql_binlog.cc')
| -rw-r--r-- | sql/sql_binlog.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/sql_binlog.cc b/sql/sql_binlog.cc index f1326d97a21..0011487f1dc 100644 --- a/sql/sql_binlog.cc +++ b/sql/sql_binlog.cc @@ -144,7 +144,7 @@ int binlog_defragment(THD *thd) } thd->lex->comment.str= // to be freed by the caller - (char *) my_malloc(thd->lex->comment.length, MYF(MY_WME)); + (char *) my_malloc(PSI_INSTRUMENT_ME, thd->lex->comment.length, MYF(MY_WME)); if (!thd->lex->comment.str) { my_error(ER_OUTOFMEMORY, MYF(ME_FATAL), 1); @@ -190,7 +190,7 @@ void mysql_client_binlog_statement(THD* thd) thd->lex->comment.length : 2048), thd->lex->comment.str)); - if (check_global_access(thd, SUPER_ACL)) + if (check_global_access(thd, PRIV_STMT_BINLOG)) DBUG_VOID_RETURN; /* @@ -211,7 +211,7 @@ void mysql_client_binlog_statement(THD* thd) size_t coded_len= 0, decoded_len= 0; rli= thd->rli_fake; - if (!rli && (rli= thd->rli_fake= new Relay_log_info(FALSE))) + if (!rli && (rli= thd->rli_fake= new Relay_log_info(FALSE, "BINLOG_BASE64_EVENT"))) rli->sql_driver_thd= thd; if (!(rgi= thd->rgi_fake)) rgi= thd->rgi_fake= new rpl_group_info(rli); @@ -243,7 +243,8 @@ void mysql_client_binlog_statement(THD* thd) } decoded_len= my_base64_needed_decoded_length((int)coded_len); - if (!(buf= (char *) my_malloc(decoded_len, MYF(MY_WME)))) + if (!(buf= (char *) my_malloc(key_memory_binlog_statement_buffer, + decoded_len, MYF(MY_WME)))) { my_error(ER_OUTOFMEMORY, MYF(ME_FATAL), 1); goto end; |