diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-11-16 10:05:19 +0100 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-11-16 10:05:19 +0100 |
| commit | 0caa22b145db22b718434566720fb7dea715692c (patch) | |
| tree | 7bb909d13afe24120327ea8c3d6aedfc42610685 /sql/sql_update.cc | |
| parent | a3d9a26d3b9ada36d7c57815614027c9fa798002 (diff) | |
| parent | d6d16303cd5e2ba623f51a115f12954fe4a0ce2c (diff) | |
| download | mariadb-git-0caa22b145db22b718434566720fb7dea715692c.tar.gz | |
Merge from mysql-5.5-bugteam to mysql-5.5-runtime
No conflicts
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 8a9feb1b3f8..b49ed2beafe 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -2072,7 +2072,9 @@ bool multi_update::send_eof() Does updates for the last n - 1 tables, returns 0 if ok; error takes into account killed status gained in do_updates() */ - int local_error = (table_count) ? do_updates() : 0; + int local_error= thd->is_error(); + if (!local_error) + local_error = (table_count) ? do_updates() : 0; /* if local_error is not set ON until after do_updates() then later carried out killing should not affect binlogging. |