diff --git a/mysql-test/t/rpl_trigger.test b/mysql-test/t/rpl_trigger.test
index c73e8b2d19e..715222f0314 100644
--- a/mysql-test/t/rpl_trigger.test
+++ b/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
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 926ae797f4c..eb54c44fa47 100644
--- a/sql/sql_parse.cc
+++ b/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 (opt_bin_log)
-    reset_dynamic(&thd->user_var_events);
-  thd->clear_error();
   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->rand_used= 0;
     thd->sent_row_count= thd->examined_row_count= 0;