diff options
| author | unknown <guilhem@mysql.com> | 2003-12-16 11:12:40 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2003-12-16 11:12:40 +0100 |
| commit | b26fd7b9222705e0483e73b8c9e0faca449561ab (patch) | |
| tree | 9e3a84bc559ab75e424d51bc38089e2299d4faa0 /sql/sql_delete.cc | |
| parent | 385b14cdbb3f63a1bd0b2cceeea1f75a17c2cb94 (diff) | |
| parent | e97722e495495468ef8a3c5e12d7080738a99841 (diff) | |
| download | mariadb-git-b26fd7b9222705e0483e73b8c9e0faca449561ab.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index bdf2cf85749..7ca259425aa 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -181,6 +181,8 @@ cleanup: mysql_update_log.write(thd,thd->query, thd->query_length); if (mysql_bin_log.is_open()) { + if (error <= 0) + thd->clear_error(); Query_log_event qinfo(thd, thd->query, thd->query_length, log_delayed); if (mysql_bin_log.write(&qinfo) && transactional_table) @@ -488,6 +490,8 @@ bool multi_delete::send_eof() mysql_update_log.write(thd,thd->query,thd->query_length); if (mysql_bin_log.is_open()) { + if (error <= 0) + thd->clear_error(); Query_log_event qinfo(thd, thd->query, thd->query_length, log_delayed); if (mysql_bin_log.write(&qinfo) && !normal_tables) @@ -600,6 +604,7 @@ end: mysql_update_log.write(thd,thd->query,thd->query_length); if (mysql_bin_log.is_open()) { + thd->clear_error(); Query_log_event qinfo(thd, thd->query, thd->query_length, thd->tmp_table); mysql_bin_log.write(&qinfo); |