Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
928140d9
Commit
928140d9
authored
14 years ago
by
Alexander Nozdrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename select_send::abort() to select_send::abort_result_set()
to be more descriptive.
parent
8ee568cd
No related merge requests found
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
20 additions
and
20 deletions
+20
-20
sql/sql_class.cc
sql/sql_class.cc
+2
-2
sql/sql_class.h
sql/sql_class.h
+6
-6
sql/sql_delete.cc
sql/sql_delete.cc
+2
-2
sql/sql_insert.cc
sql/sql_insert.cc
+5
-5
sql/sql_parse.cc
sql/sql_parse.cc
+2
-2
sql/sql_select.cc
sql/sql_select.cc
+1
-1
sql/sql_update.cc
sql/sql_update.cc
+2
-2
No files found.
sql/sql_class.cc
View file @
928140d9
...
...
@@ -1741,9 +1741,9 @@ bool select_send::send_result_set_metadata(List<Item> &list, uint flags)
return
res
;
}
void
select_send
::
abort
()
void
select_send
::
abort
_result_set
()
{
DBUG_ENTER
(
"select_send::abort"
);
DBUG_ENTER
(
"select_send::abort
_result_set
"
);
if
(
is_result_set_started
&&
thd
->
spcont
)
{
...
...
This diff is collapsed.
Click to expand it.
sql/sql_class.h
View file @
928140d9
...
...
@@ -2991,7 +2991,7 @@ public:
@retval TRUE error, an error message is set
*/
virtual
bool
check_simple_select
()
const
;
virtual
void
abort
()
{}
virtual
void
abort
_result_set
()
{}
/*
Cleanup instance of this class for next execution of a prepared
statement/stored procedure.
...
...
@@ -3034,7 +3034,7 @@ public:
bool
send_data
(
List
<
Item
>
&
items
);
bool
send_eof
();
virtual
bool
check_simple_select
()
const
{
return
FALSE
;
}
void
abort
();
void
abort
_result_set
();
virtual
void
cleanup
();
};
...
...
@@ -3126,7 +3126,7 @@ class select_insert :public select_result_interceptor {
virtual
bool
can_rollback_data
()
{
return
0
;
}
void
send_error
(
uint
errcode
,
const
char
*
err
);
bool
send_eof
();
v
oid
abor
t
();
v
irtual
void
abort_result_se
t
();
/* not implemented: select_insert is never re-used in prepared statements */
void
cleanup
();
};
...
...
@@ -3162,7 +3162,7 @@ public:
void
store_values
(
List
<
Item
>
&
values
);
void
send_error
(
uint
errcode
,
const
char
*
err
);
bool
send_eof
();
v
oid
abor
t
();
v
irtual
void
abort_result_se
t
();
virtual
bool
can_rollback_data
()
{
return
1
;
}
// Needed for access from local class MY_HOOKS in prepare(), since thd is proteted.
...
...
@@ -3496,7 +3496,7 @@ public:
{
return
deleted
;
}
virtual
void
abort
();
virtual
void
abort
_result_set
();
};
...
...
@@ -3547,7 +3547,7 @@ public:
{
return
updated
;
}
virtual
void
abort
();
virtual
void
abort
_result_set
();
};
class
my_var
:
public
Sql_alloc
{
...
...
This diff is collapsed.
Click to expand it.
sql/sql_delete.cc
View file @
928140d9
...
...
@@ -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
||
...
...
This diff is collapsed.
Click to expand it.
sql/sql_insert.cc
View file @
928140d9
...
...
@@ -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 */
...
...
This diff is collapsed.
Click to expand it.
sql/sql_parse.cc
View file @
928140d9
...
...
@@ -3401,7 +3401,7 @@ end_with_restore_list:
res
|=
thd
->
is_error
();
MYSQL_MULTI_DELETE_DONE
(
res
,
del_result
->
num_deleted
());
if
(
res
)
del_result
->
abort
();
del_result
->
abort
_result_set
();
delete
del_result
;
}
else
...
...
@@ -4858,7 +4858,7 @@ static bool execute_sqlcom_select(THD *thd, TABLE_LIST *all_tables)
ER_YES
,
str
.
ptr
());
}
if
(
res
)
result
->
abort
();
result
->
abort
_result_set
();
else
result
->
send_eof
();
delete
result
;
...
...
This diff is collapsed.
Click to expand it.
sql/sql_select.cc
View file @
928140d9
...
...
@@ -300,7 +300,7 @@ bool handle_select(THD *thd, LEX *lex, select_result *result,
thd
->
is_error
()));
res
|=
thd
->
is_error
();
if
(
unlikely
(
res
))
result
->
abort
();
result
->
abort
_result_set
();
MYSQL_SELECT_DONE
((
int
)
res
,
(
ulong
)
thd
->
limit_found_rows
);
DBUG_RETURN
(
res
);
...
...
This diff is collapsed.
Click to expand it.
sql/sql_update.cc
View file @
928140d9
...
...
@@ -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
||
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment