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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
27ef2fda
Commit
27ef2fda
authored
Dec 27, 2011
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix test suite
parent
c01fc2ab
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
6 deletions
+9
-6
mysql-test/r/kill.result
mysql-test/r/kill.result
+1
-3
mysql-test/t/flush_read_lock_kill.test
mysql-test/t/flush_read_lock_kill.test
+1
-1
mysql-test/t/kill.test
mysql-test/t/kill.test
+4
-1
sql/threadpool_common.cc
sql/threadpool_common.cc
+3
-1
No files found.
mysql-test/r/kill.result
View file @
27ef2fda
...
@@ -60,9 +60,7 @@ SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
...
@@ -60,9 +60,7 @@ SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
KILL @id;
KILL @id;
SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
Got one of the listed errors
Got one of the listed errors
SELECT 1;
Got one of the listed errors
1
1
SET DEBUG_SYNC = 'RESET';
SET DEBUG_SYNC = 'RESET';
DROP TABLE t1, t2;
DROP TABLE t1, t2;
SET DEBUG_SYNC= 'before_acos_function SIGNAL in_sync WAIT_FOR kill';
SET DEBUG_SYNC= 'before_acos_function SIGNAL in_sync WAIT_FOR kill';
...
...
mysql-test/t/flush_read_lock_kill.test
View file @
27ef2fda
...
@@ -65,7 +65,7 @@ KILL CONNECTION @id;
...
@@ -65,7 +65,7 @@ KILL CONNECTION @id;
connection
con1
;
connection
con1
;
--
echo
# Try to reap FLUSH TABLES WITH READ LOCK,
--
echo
# Try to reap FLUSH TABLES WITH READ LOCK,
--
echo
# it fail due to killed statement and connection.
--
echo
# it fail due to killed statement and connection.
--
error
1317
,
2013
--
error
1317
,
2013
,
1927
reap
;
reap
;
--
echo
# Switching to 'con2'.
--
echo
# Switching to 'con2'.
...
...
mysql-test/t/kill.test
View file @
27ef2fda
...
@@ -142,9 +142,12 @@ KILL @id;
...
@@ -142,9 +142,12 @@ KILL @id;
SET
DEBUG_SYNC
=
'now WAIT_FOR con1_end'
;
SET
DEBUG_SYNC
=
'now WAIT_FOR con1_end'
;
connection
con1
;
connection
con1
;
--
error
1317
,
1053
,
2006
,
2013
--
error
1317
,
1053
,
2006
,
2013
,
1927
reap
;
reap
;
--
disable_query_log
--
error
2013
,
0
SELECT
1
;
SELECT
1
;
--
enable_query_log
connection
default
;
connection
default
;
SET
DEBUG_SYNC
=
'RESET'
;
SET
DEBUG_SYNC
=
'RESET'
;
...
...
sql/threadpool_common.cc
View file @
27ef2fda
...
@@ -71,7 +71,9 @@ static inline bool thread_attach(THD* thd, char *stack_start, PSI_thread **save_
...
@@ -71,7 +71,9 @@ static inline bool thread_attach(THD* thd, char *stack_start, PSI_thread **save_
static
inline
void
thread_detach
(
THD
*
thd
,
PSI_thread
*
restore_psi_thread
)
static
inline
void
thread_detach
(
THD
*
thd
,
PSI_thread
*
restore_psi_thread
)
{
{
DBUG_ENTER
(
"thread_detach"
);
DBUG_ENTER
(
"thread_detach"
);
mysql_mutex_lock
(
&
thd
->
LOCK_thd_data
);
thd
->
mysys_var
=
NULL
;
thd
->
mysys_var
=
NULL
;
mysql_mutex_unlock
(
&
thd
->
LOCK_thd_data
);
#ifndef DBUG_OFF
#ifndef DBUG_OFF
/*
/*
If during the session @@session.dbug was assigned, the
If during the session @@session.dbug was assigned, the
...
@@ -161,7 +163,7 @@ int threadpool_process_request(THD *thd)
...
@@ -161,7 +163,7 @@ int threadpool_process_request(THD *thd)
PSI_thread
*
psi_thread
;
PSI_thread
*
psi_thread
;
thread_attach
(
thd
,
(
char
*
)
&
thd
,
&
psi_thread
);
thread_attach
(
thd
,
(
char
*
)
&
thd
,
&
psi_thread
);
if
(
thd
->
killed
=
=
KILL_CONNECTION
)
if
(
thd
->
killed
>
=
KILL_CONNECTION
)
{
{
/*
/*
kill flag can be set have been killed by
kill flag can be set have been killed by
...
...
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