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 | 8909586f160a951dddc32cd38020f78518cc4ffd (patch) | |
| tree | 0c3c183e8119e39384a7643ad4084c34af66aa0d /sql/sql_insert.cc | |
| parent | c6a34a99616c749c1d4874c9e7f7424fd2765de6 (diff) | |
| download | mariadb-git-8909586f160a951dddc32cd38020f78518cc4ffd.tar.gz | |
Rename select_send::abort() to select_send::abort_result_set()
to be more descriptive.
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index c783d74b363..58609ead548 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -3413,9 +3413,9 @@ bool select_insert::send_eof() DBUG_RETURN(0); } -void select_insert::abort() { +void select_insert::abort_result_set() { - DBUG_ENTER("select_insert::abort"); + DBUG_ENTER("select_insert::abort_result_set"); /* If the creation of the table failed (due to a syntax error, for example), no table will have been opened and therefore 'table' @@ -3952,9 +3952,9 @@ bool select_create::send_eof() } -void select_create::abort() +void select_create::abort_result_set() { - DBUG_ENTER("select_create::abort"); + DBUG_ENTER("select_create::abort_result_set"); /* In select_insert::abort() we roll back the statement, including @@ -3972,7 +3972,7 @@ void select_create::abort() log state. */ tmp_disable_binlog(thd); - select_insert::abort(); + select_insert::abort_result_set(); thd->transaction.stmt.modified_non_trans_table= FALSE; reenable_binlog(thd); /* possible error of writing binary log is ignored deliberately */ |