Skip to content

Commit 98cfe1e

Browse files
author
Tatiana Azundris Nuernberg
committed
fixes rpl_expose_password-bug20712046 (test case)
fixes rpl_mts_slave_preserve_commit_order_deadlock_error (log_event.cc) fixes processlist_priv_no_prot (rpl_rli.cc) fixes rpl_row_ignorable_event (rpl_rli.cc) Clean-up for Bug#20712046 which was Approved by: Karthik Kamath <[email protected]>
1 parent ded1304 commit 98cfe1e

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

sql/log_event.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4737,6 +4737,7 @@ int Query_log_event::do_apply_event(Relay_log_info const *rli,
47374737
thd->set_time(&when);
47384738
thd->set_query_and_id((char*)query_arg, q_len_arg,
47394739
thd->charset(), next_query_id());
4740+
thd->set_query_for_display(query_arg, q_len_arg);
47404741
thd->variables.pseudo_thread_id= thread_id; // for temp tables
47414742
attach_temp_tables_worker(thd);
47424743
DBUG_PRINT("query",("%s", thd->query()));

sql/rpl_rli.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
1+
/* Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License as published by
@@ -1539,6 +1539,7 @@ void Relay_log_info::cleanup_context(THD *thd, bool error)
15391539
}
15401540
if (rows_query_ev)
15411541
{
1542+
info_thd->reset_query_for_display();
15421543
delete rows_query_ev;
15431544
rows_query_ev= NULL;
15441545
info_thd->set_query(NULL, 0);

0 commit comments

Comments
 (0)