database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Rename select_send::abort() to select_send::abort_result_set()

Browse Source 
to be more descriptive.
This commit is contained in:
Alexander Nozdrin
2010-07-28 15:17:19 +04:00
parent 8ee568cde7
commit 928140d90e
7 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_insert.cc
View File

@ -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 */