summaryrefslogtreecommitdiff
path: root/sql/log_event.cc
diff options
context:
space:
mode:
authorMikael Ronstrom <mikael@mysql.com>2009-11-24 14:28:38 +0100
committerMikael Ronstrom <mikael@mysql.com>2009-11-24 14:28:38 +0100
commit9ea65e5fa98ad56925d709d853a621de38cf1a71 (patch)
treef1258abebfddc53223b97ac54d52a750cc6eda78 /sql/log_event.cc
parent39703a1b933779436cbb2b0d2fcdd99a0864855b (diff)
downloadmariadb-git-9ea65e5fa98ad56925d709d853a621de38cf1a71.tar.gz
WL#5138, Fixed according to code review comments from Davi
Diffstat (limited to 'sql/log_event.cc')
-rw-r--r--sql/log_event.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 58ed5aa6a60..608f4d25cf4 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -3055,8 +3055,7 @@ int Query_log_event::do_apply_event(Relay_log_info const *rli,
rpl_filter->db_ok(thd->db))
{
thd->set_time((time_t)when);
- thd->set_query((char*)query_arg, q_len_arg);
- thd->query_id = next_query_id();
+ thd->set_query_and_id((char*)query_arg, q_len_arg, next_query_id());
thd->variables.pseudo_thread_id= thread_id; // for temp tables
DBUG_PRINT("query",("%s", thd->query()));
@@ -8068,7 +8067,7 @@ int Table_map_log_event::do_apply_event(Relay_log_info const *rli)
DBUG_ASSERT(rli->sql_thd == thd);
/* Step the query id to mark what columns that are actually used. */
- thd->query_id= next_query_id();
+ thd->set_query_id(next_query_id());
if (!(memory= my_multi_malloc(MYF(MY_WME),
&table_list, (uint) sizeof(RPL_TABLE_LIST),