Don't clear warnings for functions or triggers

Fixed failing test


mysql-test/t/rpl_trigger.test:
  Added missing option that caused the test to fail sometimes
sql/sql_parse.cc:
  Don't clear warnings for functions or triggers

mysql-test/t/rpl_trigger.test

@@ -87,6 +87,7 @@ insert into t1 set a = now();
 select a=b && a=c from t1;
 let $time=`select a from t1`;
 
+save_master_pos;
 connection slave;
 sync_with_master;
 --disable_query_log

sql/sql_parse.cc

@@ -5208,11 +5208,11 @@ void mysql_reset_thd_for_next_command(THD *thd)
                           SERVER_QUERY_NO_INDEX_USED |
                           SERVER_QUERY_NO_GOOD_INDEX_USED);
   thd->tmp_table_used= 0;
+  if (!thd->in_sub_stmt)
+  {
     if (opt_bin_log)
       reset_dynamic(&thd->user_var_events);
     thd->clear_error();
-  if (!thd->in_sub_stmt)
-  {
     thd->total_warn_count=0;			// Warnings for this query
     thd->rand_used= 0;
     thd->sent_row_count= thd->examined_row_count= 0;