diff options
| author | unknown <monty@mysql.com> | 2005-08-15 20:08:58 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-08-15 20:08:58 +0300 |
| commit | 51919db078cecf452baf474aaee44439433bcfaf (patch) | |
| tree | c127e577d12b9706f4faa8f78e9aeb455a172ba3 /sql/sql_parse.cc | |
| parent | c5aac211d02ebf672237141fbe767dd9d3af26da (diff) | |
| download | mariadb-git-51919db078cecf452baf474aaee44439433bcfaf.tar.gz | |
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
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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; |