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
77a0c9b1
Commit
77a0c9b1
authored
Sep 13, 2014
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tokudb: use thd_killed() api function, not thd->killed directly
parent
e7ddd89a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
6 deletions
+8
-6
storage/tokudb/ha_tokudb.cc
storage/tokudb/ha_tokudb.cc
+6
-6
storage/tokudb/mysql-test/tokudb_bugs/t/xa-3.test
storage/tokudb/mysql-test/tokudb_bugs/t/xa-3.test
+1
-0
storage/tokudb/mysql-test/tokudb_bugs/t/xa-4.test
storage/tokudb/mysql-test/tokudb_bugs/t/xa-4.test
+1
-0
No files found.
storage/tokudb/ha_tokudb.cc
View file @
77a0c9b1
...
...
@@ -471,7 +471,7 @@ typedef struct index_read_info {
static
int
ai_poll_fun
(
void
*
extra
,
float
progress
)
{
LOADER_CONTEXT
context
=
(
LOADER_CONTEXT
)
extra
;
if
(
context
->
thd
->
killed
)
{
if
(
thd_killed
(
context
->
thd
)
)
{
sprintf
(
context
->
write_status_msg
,
"The process has been killed, aborting add index."
);
return
ER_ABORTING_CONNECTION
;
}
...
...
@@ -486,7 +486,7 @@ static int ai_poll_fun(void *extra, float progress) {
static
int
loader_poll_fun
(
void
*
extra
,
float
progress
)
{
LOADER_CONTEXT
context
=
(
LOADER_CONTEXT
)
extra
;
if
(
context
->
thd
->
killed
)
{
if
(
thd_killed
(
context
->
thd
)
)
{
sprintf
(
context
->
write_status_msg
,
"The process has been killed, aborting bulk load."
);
return
ER_ABORTING_CONNECTION
;
}
...
...
@@ -3330,7 +3330,7 @@ int ha_tokudb::end_bulk_insert(bool abort) {
ai_metadata_update_required
=
false
;
loader_error
=
0
;
if
(
loader
)
{
if
(
!
abort_loader
&&
!
thd
->
killed
)
{
if
(
!
abort_loader
&&
!
thd
_killed
(
thd
)
)
{
DBUG_EXECUTE_IF
(
"tokudb_end_bulk_insert_sleep"
,
{
const
char
*
orig_proc_info
=
tokudb_thd_get_proc_info
(
thd
);
thd_proc_info
(
thd
,
"DBUG sleep"
);
...
...
@@ -3340,7 +3340,7 @@ int ha_tokudb::end_bulk_insert(bool abort) {
error
=
loader
->
close
(
loader
);
loader
=
NULL
;
if
(
error
)
{
if
(
thd
->
killed
)
{
if
(
thd
_killed
(
thd
)
)
{
my_error
(
ER_QUERY_INTERRUPTED
,
MYF
(
0
));
}
goto
cleanup
;
...
...
@@ -3475,7 +3475,7 @@ int ha_tokudb::is_index_unique(bool* is_unique, DB_TXN* txn, DB* db, KEY* key_in
share
->
rows
,
key_info
->
name
);
thd_proc_info
(
thd
,
status_msg
);
if
(
thd
->
killed
)
{
if
(
thd
_killed
(
thd
)
)
{
my_error
(
ER_QUERY_INTERRUPTED
,
MYF
(
0
));
error
=
ER_QUERY_INTERRUPTED
;
goto
cleanup
;
...
...
@@ -7732,7 +7732,7 @@ int ha_tokudb::tokudb_add_index(
thd_progress_report
(
thd
,
num_processed
,
(
long
long
unsigned
)
share
->
rows
);
#endif
if
(
thd
->
killed
)
{
if
(
thd
_killed
(
thd
)
)
{
error
=
ER_ABORTING_CONNECTION
;
goto
cleanup
;
}
...
...
storage/tokudb/mysql-test/tokudb_bugs/t/xa-3.test
View file @
77a0c9b1
--
source
include
/
have_innodb
.
inc
--
source
include
/
have_tokudb
.
inc
--
source
include
/
have_debug
.
inc
--
source
include
/
not_embedded
.
inc
--
disable_warnings
drop
table
if
exists
t1
,
t2
;
...
...
storage/tokudb/mysql-test/tokudb_bugs/t/xa-4.test
View file @
77a0c9b1
--
source
include
/
have_innodb
.
inc
--
source
include
/
have_tokudb
.
inc
--
source
include
/
have_debug
.
inc
--
source
include
/
not_embedded
.
inc
--
disable_warnings
drop
table
if
exists
t1
,
t2
;
...
...
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