diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-07-28 15:17:19 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-07-28 15:17:19 +0400 |
| commit | 928140d90ec0e039ba7d27aa06bfa8a416e96822 (patch) | |
| tree | 0c3c183e8119e39384a7643ad4084c34af66aa0d /sql/sql_update.cc | |
| parent | 8ee568cde7bef3893f5500d07ef45cb58107cff3 (diff) | |
| download | mariadb-git-928140d90ec0e039ba7d27aa06bfa8a416e96822.tar.gz | |
Rename select_send::abort() to select_send::abort_result_set()
to be more descriptive.
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 || |