Commit 9ad7c899 authored by Oleksandr Byelkin's avatar Oleksandr Byelkin

Fix of incorrect merge of MDEV-31877: ASAN errors in...

Fix of incorrect merge of MDEV-31877: ASAN errors in Exec_time_tracker::get_cycles with innodb slow log verbosity
(8d210fc2)
parent 29a02899
...@@ -987,7 +987,6 @@ int ...@@ -987,7 +987,6 @@ int
sp_instr_set::exec_core(THD *thd, uint *nextp) sp_instr_set::exec_core(THD *thd, uint *nextp)
{ {
int res= get_rcontext(thd)->set_variable(thd, m_offset, &m_value); int res= get_rcontext(thd)->set_variable(thd, m_offset, &m_value);
delete_explain_query(thd->lex);
*nextp = m_ip+1; *nextp = m_ip+1;
return res; return res;
} }
...@@ -1029,7 +1028,6 @@ sp_instr_set_row_field::exec_core(THD *thd, uint *nextp) ...@@ -1029,7 +1028,6 @@ sp_instr_set_row_field::exec_core(THD *thd, uint *nextp)
int res= get_rcontext(thd)->set_variable_row_field(thd, m_offset, int res= get_rcontext(thd)->set_variable_row_field(thd, m_offset,
m_field_offset, m_field_offset,
&m_value); &m_value);
delete_explain_query(thd->lex);
*nextp= m_ip + 1; *nextp= m_ip + 1;
return res; return res;
} }
...@@ -1077,7 +1075,6 @@ sp_instr_set_row_field_by_name::exec_core(THD *thd, uint *nextp) ...@@ -1077,7 +1075,6 @@ sp_instr_set_row_field_by_name::exec_core(THD *thd, uint *nextp)
int res= get_rcontext(thd)->set_variable_row_field_by_name(thd, m_offset, int res= get_rcontext(thd)->set_variable_row_field_by_name(thd, m_offset,
m_field_name, m_field_name,
&m_value); &m_value);
delete_explain_query(thd->lex);
*nextp= m_ip + 1; *nextp= m_ip + 1;
return res; return res;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment