summaryrefslogtreecommitdiff
path: root/sql/log_event.cc
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@askmonty.org>2016-03-22 23:26:39 +0400
committerAlexey Botchkov <holyfoot@askmonty.org>2016-03-22 23:26:39 +0400
commit0a4a78ae8cd6844c34f9ed391dfb0eb71244f229 (patch)
treee8915eae7fa2c99082d4efc52a21ef857377c59b /sql/log_event.cc
parentfd6c588659a96140404b05b18e5f8940d1ed9595 (diff)
downloadmariadb-git-0a4a78ae8cd6844c34f9ed391dfb0eb71244f229.tar.gz
MDEV-6058 MySQL Bug #11766693: LOG-SLOW-ADMIN-STATEMENTS AND
LOG-SLOW-SLAVE-STATEMENTS NOT DISPLAYED. These parameters were moved from the command line options to the system variables section. Treatment of the opt_log_slow_slave_statements changed to let the dynamic change of the variable.
Diffstat (limited to 'sql/log_event.cc')
-rw-r--r--sql/log_event.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 98165cc4797..ea0afddafbe 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -4428,6 +4428,15 @@ int Query_log_event::do_apply_event(rpl_group_info *rgi,
if (thd->m_digest != NULL)
thd->m_digest->reset(thd->m_token_array, max_digest_length);
+ if (thd->slave_thread)
+ {
+ /*
+ The opt_log_slow_slave_statements variable can be changed
+ dynamically, so we have to set the sql_log_slow respectively.
+ */
+ thd->variables.sql_log_slow= opt_log_slow_slave_statements;
+ }
+
thd->enable_slow_log= thd->variables.sql_log_slow;
mysql_parse(thd, thd->query(), thd->query_length(), &parser_state);
/* Finalize server status flags after executing a statement. */