diff options
| author | Alexander Nozdrin <alik@ibmvm> | 2010-08-04 12:18:32 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@ibmvm> | 2010-08-04 12:18:32 +0400 |
| commit | aeeafbb39656fc4678c72b00f958215754b32dc7 (patch) | |
| tree | 512613b578f3b028a4c6b6272b2dc4820676ad8b /sql/sql_delete.cc | |
| parent | efc8a279356bd2afd8d6af341f7cf80860475efd (diff) | |
| parent | 81906cdf3805fe5fcea47fef11945f9adbcef4d8 (diff) | |
| download | mariadb-git-aeeafbb39656fc4678c72b00f958215754b32dc7.tar.gz | |
Auto-merge from mysql-5.5.
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 00666bc85b4..2f69bac917e 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -770,9 +770,9 @@ void multi_delete::send_error(uint errcode,const char *err) } -void multi_delete::abort() +void multi_delete::abort_result_set() { - DBUG_ENTER("multi_delete::abort"); + DBUG_ENTER("multi_delete::abort_result_set"); /* the error was handled or nothing deleted and no side effects return */ if (error_handled || |