diff options
| author | Vasil Dimov <vasil.dimov@oracle.com> | 2010-08-18 10:14:06 +0300 |
|---|---|---|
| committer | Vasil Dimov <vasil.dimov@oracle.com> | 2010-08-18 10:14:06 +0300 |
| commit | ec4209255f197b1b489fc1e4b27c39705715fafc (patch) | |
| tree | 6b698195b0e38d96723caf01255a662d47b2d3ba /sql/sql_update.cc | |
| parent | 085bb22ab275ee0b4733764f51feb986c0cac63a (diff) | |
| parent | 48bc7c028db55015c033f9b86d90137f6cd4b1c8 (diff) | |
| download | mariadb-git-ec4209255f197b1b489fc1e4b27c39705715fafc.tar.gz | |
Merge mysql-5.5-bugfixing -> mysql-5.5-innodb
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index c52467531a9..35478e28520 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -1261,7 +1261,7 @@ bool mysql_multi_update(THD *thd, { /* If we had a another error reported earlier then this will be ignored */ (*result)->send_error(ER_UNKNOWN_ERROR, ER(ER_UNKNOWN_ERROR)); - (*result)->abort(); + (*result)->abort_result_set(); } thd->abort_on_warning= 0; DBUG_RETURN(res); @@ -1861,7 +1861,7 @@ void multi_update::send_error(uint errcode,const char *err) } -void multi_update::abort() +void multi_update::abort_result_set() { /* the error was handled or nothing deleted and no side effects return */ if (error_handled || |