diff options
| author | He Zhenxing <zhenxing.he@sun.com> | 2010-01-24 15:03:23 +0800 |
|---|---|---|
| committer | He Zhenxing <zhenxing.he@sun.com> | 2010-01-24 15:03:23 +0800 |
| commit | 6bf8c119feff7e15d19aea0a6893b2706891d3c1 (patch) | |
| tree | 30ea0d6bf62fef90f4f1499d15e388cb43241707 /sql/sql_update.cc | |
| parent | a365016f8b0cf007d40d12405a3b7b3990951ba2 (diff) | |
| download | mariadb-git-6bf8c119feff7e15d19aea0a6893b2706891d3c1.tar.gz | |
Backport Bug#37148 to 5.1
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 26f40c7fa9f..433e2619aca 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -1868,9 +1868,10 @@ void multi_update::abort() into repl event. */ int errcode= query_error_code(thd, thd->killed == THD::NOT_KILLED); - thd->binlog_query(THD::ROW_QUERY_TYPE, - thd->query(), thd->query_length(), - transactional_tables, FALSE, errcode); + /* the error of binary logging is ignored */ + (void)thd->binlog_query(THD::ROW_QUERY_TYPE, + thd->query(), thd->query_length(), + transactional_tables, FALSE, errcode); } thd->transaction.all.modified_non_trans_table= TRUE; } |