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 | 2ef19bdcc420d090d0bed822a884eef40cd347a9 (patch) | |
| tree | 7bb909d13afe24120327ea8c3d6aedfc42610685 /sql/sql_update.cc | |
| parent | 294f3865cd5ca119dbc516e814a1594e2f8c1886 (diff) | |
| parent | b4b3c996af688aabb0001dbbf925084c46858fa7 (diff) | |
| download | mariadb-git-2ef19bdcc420d090d0bed822a884eef40cd347a9.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. |