database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Don't clear warnings for functions or triggers

Browse Source 
Fixed failing test
This commit is contained in:
monty@mysql.com
2005-08-15 20:08:58 +03:00
parent 1a6f16edd9
commit c10f05552f
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/t/rpl_trigger.test
View File

@ -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

6
sql/sql_parse.cc
View File

@ -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;