diff options
| author | guilhem@mysql.com <> | 2003-12-16 11:12:40 +0100 |
|---|---|---|
| committer | guilhem@mysql.com <> | 2003-12-16 11:12:40 +0100 |
| commit | e56c8c61d83fce91fe6ff0da66e05b80255cfbf1 (patch) | |
| tree | 9e3a84bc559ab75e424d51bc38089e2299d4faa0 /sql/sql_update.cc | |
| parent | 5310897786e927f7f3dfd028886d69b0e1add508 (diff) | |
| parent | db2d812d1b2b554e10cebf9809e26d1d1dc4bbc9 (diff) | |
| download | mariadb-git-e56c8c61d83fce91fe6ff0da66e05b80255cfbf1.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 27b498d350f..4f5f21d61ad 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -319,6 +319,8 @@ int mysql_update(THD *thd, 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) @@ -962,6 +964,8 @@ bool multi_update::send_eof() mysql_update_log.write(thd,thd->query,thd->query_length); if (mysql_bin_log.is_open()) { + if (local_error <= 0) + thd->clear_error(); Query_log_event qinfo(thd, thd->query, thd->query_length, log_delayed); if (mysql_bin_log.write(&qinfo) && trans_safe) |