Commit c10f0555 authored by monty@mysql.com's avatar monty@mysql.com

Don't clear warnings for functions or triggers

Fixed failing test
parent 1a6f16ed
...@@ -87,6 +87,7 @@ insert into t1 set a = now(); ...@@ -87,6 +87,7 @@ insert into t1 set a = now();
select a=b && a=c from t1; select a=b && a=c from t1;
let $time=`select a from t1`; let $time=`select a from t1`;
save_master_pos;
connection slave; connection slave;
sync_with_master; sync_with_master;
--disable_query_log --disable_query_log
......
...@@ -5208,11 +5208,11 @@ void mysql_reset_thd_for_next_command(THD *thd) ...@@ -5208,11 +5208,11 @@ void mysql_reset_thd_for_next_command(THD *thd)
SERVER_QUERY_NO_INDEX_USED | SERVER_QUERY_NO_INDEX_USED |
SERVER_QUERY_NO_GOOD_INDEX_USED); SERVER_QUERY_NO_GOOD_INDEX_USED);
thd->tmp_table_used= 0; thd->tmp_table_used= 0;
if (opt_bin_log)
reset_dynamic(&thd->user_var_events);
thd->clear_error();
if (!thd->in_sub_stmt) if (!thd->in_sub_stmt)
{ {
if (opt_bin_log)
reset_dynamic(&thd->user_var_events);
thd->clear_error();
thd->total_warn_count=0; // Warnings for this query thd->total_warn_count=0; // Warnings for this query
thd->rand_used= 0; thd->rand_used= 0;
thd->sent_row_count= thd->examined_row_count= 0; thd->sent_row_count= thd->examined_row_count= 0;
......
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