diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-30 21:47:11 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-30 21:47:11 +0300 |
| commit | 5aa4c33e3233e2c1cac9f3bb0b17379a56503666 (patch) | |
| tree | 5bb7d787b7b4c25140afb74590153f8109510d61 /sql/sql_update.cc | |
| parent | b436e0ae20da93f6ebf3231ac28f397966187175 (diff) | |
| parent | dad4291b781495cfdc8abac9dc2902621bfb3b56 (diff) | |
| download | mariadb-git-5aa4c33e3233e2c1cac9f3bb0b17379a56503666.tar.gz | |
Manual merge from mysql-5.1-bugteam.
Conflicts:
- sql/mysql_priv.h
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 eec4d4f53ca..c9c4501f072 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -1875,9 +1875,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; } |