summaryrefslogtreecommitdiff
path: root/sql/log_event.cc
diff options
context:
space:
mode:
authorDavi Arnaut <davi.arnaut@oracle.com>2010-11-16 19:57:18 -0200
committerDavi Arnaut <davi.arnaut@oracle.com>2010-11-16 19:57:18 -0200
commit247a696d79f9cbc7dd2dbc43ce668e91f69dd8bf (patch)
tree6dbd0d2f6a9f7125b8fa31302c4bf78baa9b72bf /sql/log_event.cc
parentb5ec36073121454ed5924ce701588c0432a2e886 (diff)
downloadmariadb-git-247a696d79f9cbc7dd2dbc43ce668e91f69dd8bf.tar.gz
Bug#57058: SERVER_QUERY_WAS_SLOW not wired up.
Finalize the server flags after any kind of command is executed. To avoid updating the flag multiple times, reorganize code so that its invoked only once for each command. sql/log_event.cc: Explicit update after the query is executed in the slave. sql/sql_parse.cc: Reorganize so that the status flag is updated for any command and not done twice for a query command.
Diffstat (limited to 'sql/log_event.cc')
-rw-r--r--sql/log_event.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 2feb69493a8..5041e6225de 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -3353,6 +3353,8 @@ int Query_log_event::do_apply_event(Relay_log_info const *rli,
if (!parser_state.init(thd, thd->query(), thd->query_length()))
{
mysql_parse(thd, thd->query(), thd->query_length(), &parser_state);
+ /* Finalize server status flags after executing a statement. */
+ thd->update_server_status();
log_slow_statement(thd);
}