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
612a8ccb
Commit
612a8ccb
authored
15 years ago
by
Sergey Vojtovich
Browse files
Options
Browse Files
Download
Plain Diff
Merge fix for BUG#43171.
parents
445904a3
d6f27e58
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
97 additions
and
2 deletions
+97
-2
mysql-test/r/xa.result
mysql-test/r/xa.result
+25
-0
mysql-test/t/xa.test
mysql-test/t/xa.test
+62
-0
sql/handler.cc
sql/handler.cc
+2
-1
sql/sql_parse.cc
sql/sql_parse.cc
+8
-1
No files found.
mysql-test/r/xa.result
View file @
612a8ccb
...
@@ -89,3 +89,28 @@ xa start 'a';
...
@@ -89,3 +89,28 @@ xa start 'a';
xa end 'a';
xa end 'a';
xa prepare 'a';
xa prepare 'a';
xa commit 'a';
xa commit 'a';
CREATE TABLE t1(a INT, KEY(a)) ENGINE=InnoDB;
INSERT INTO t1 VALUES(1),(2);
BEGIN;
UPDATE t1 SET a=3 WHERE a=1;
BEGIN;
UPDATE t1 SET a=4 WHERE a=2;
UPDATE t1 SET a=5 WHERE a=2;
UPDATE t1 SET a=5 WHERE a=1;
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
ROLLBACK;
ROLLBACK;
BEGIN;
UPDATE t1 SET a=3 WHERE a=1;
XA START 'xid1';
UPDATE t1 SET a=4 WHERE a=2;
UPDATE t1 SET a=5 WHERE a=2;
UPDATE t1 SET a=5 WHERE a=1;
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
XA END 'xid1';
ERROR XA102: XA_RBDEADLOCK: Transaction branch was rolled back: deadlock was detected
XA ROLLBACK 'xid1';
XA START 'xid1';
XA END 'xid1';
XA ROLLBACK 'xid1';
DROP TABLE t1;
This diff is collapsed.
Click to expand it.
mysql-test/t/xa.test
View file @
612a8ccb
...
@@ -149,6 +149,68 @@ xa end 'a';
...
@@ -149,6 +149,68 @@ xa end 'a';
xa
prepare
'a'
;
xa
prepare
'a'
;
xa
commit
'a'
;
xa
commit
'a'
;
#
# BUG#43171 - Assertion failed: thd->transaction.xid_state.xid.is_null()
#
CREATE
TABLE
t1
(
a
INT
,
KEY
(
a
))
ENGINE
=
InnoDB
;
INSERT
INTO
t1
VALUES
(
1
),(
2
);
connect
(
con1
,
localhost
,
root
,,);
# Part 1: Prepare to test XA START after regular transaction deadlock
BEGIN
;
UPDATE
t1
SET
a
=
3
WHERE
a
=
1
;
connection
default
;
BEGIN
;
UPDATE
t1
SET
a
=
4
WHERE
a
=
2
;
connection
con1
;
let
$conn_id
=
`SELECT CONNECTION_ID()`
;
SEND
UPDATE
t1
SET
a
=
5
WHERE
a
=
2
;
connection
default
;
let
$wait_timeout
=
2
;
let
$wait_condition
=
SELECT
1
FROM
INFORMATION_SCHEMA
.
PROCESSLIST
WHERE
ID
=
$conn_id
AND
STATE
=
'Searching rows for update'
;
--
source
include
/
wait_condition
.
inc
--
error
ER_LOCK_DEADLOCK
UPDATE
t1
SET
a
=
5
WHERE
a
=
1
;
ROLLBACK
;
# Part 2: Prepare to test XA START after XA transaction deadlock
connection
con1
;
REAP
;
ROLLBACK
;
BEGIN
;
UPDATE
t1
SET
a
=
3
WHERE
a
=
1
;
connection
default
;
XA
START
'xid1'
;
UPDATE
t1
SET
a
=
4
WHERE
a
=
2
;
connection
con1
;
SEND
UPDATE
t1
SET
a
=
5
WHERE
a
=
2
;
connection
default
;
let
$wait_timeout
=
2
;
let
$wait_condition
=
SELECT
1
FROM
INFORMATION_SCHEMA
.
PROCESSLIST
WHERE
ID
=
$conn_id
AND
STATE
=
'Searching rows for update'
;
--
source
include
/
wait_condition
.
inc
--
error
ER_LOCK_DEADLOCK
UPDATE
t1
SET
a
=
5
WHERE
a
=
1
;
--
error
ER_XA_RBDEADLOCK
XA
END
'xid1'
;
XA
ROLLBACK
'xid1'
;
XA
START
'xid1'
;
XA
END
'xid1'
;
XA
ROLLBACK
'xid1'
;
disconnect
con1
;
DROP
TABLE
t1
;
# Wait till all disconnects are completed
# Wait till all disconnects are completed
--
source
include
/
wait_until_count_sessions
.
inc
--
source
include
/
wait_until_count_sessions
.
inc
This diff is collapsed.
Click to expand it.
sql/handler.cc
View file @
612a8ccb
...
@@ -1311,7 +1311,8 @@ int ha_rollback_trans(THD *thd, bool all)
...
@@ -1311,7 +1311,8 @@ int ha_rollback_trans(THD *thd, bool all)
}
}
trans
->
ha_list
=
0
;
trans
->
ha_list
=
0
;
trans
->
no_2pc
=
0
;
trans
->
no_2pc
=
0
;
if
(
is_real_trans
&&
thd
->
transaction_rollback_request
)
if
(
is_real_trans
&&
thd
->
transaction_rollback_request
&&
thd
->
transaction
.
xid_state
.
xa_state
!=
XA_NOTR
)
thd
->
transaction
.
xid_state
.
rm_error
=
thd
->
main_da
.
sql_errno
();
thd
->
transaction
.
xid_state
.
rm_error
=
thd
->
main_da
.
sql_errno
();
if
(
all
)
if
(
all
)
thd
->
variables
.
tx_isolation
=
thd
->
session_tx_isolation
;
thd
->
variables
.
tx_isolation
=
thd
->
session_tx_isolation
;
...
...
This diff is collapsed.
Click to expand it.
sql/sql_parse.cc
View file @
612a8ccb
...
@@ -122,6 +122,14 @@ static bool xa_trans_rolled_back(XID_STATE *xid_state)
...
@@ -122,6 +122,14 @@ static bool xa_trans_rolled_back(XID_STATE *xid_state)
*/
*/
static
bool
xa_trans_rollback
(
THD
*
thd
)
static
bool
xa_trans_rollback
(
THD
*
thd
)
{
{
/*
Resource Manager error is meaningless at this point, as we perform
explicit rollback request by user. We must reset rm_error before
calling ha_rollback(), so thd->transaction.xid structure gets reset
by ha_rollback()/THD::transaction::cleanup().
*/
thd
->
transaction
.
xid_state
.
rm_error
=
0
;
bool
status
=
test
(
ha_rollback
(
thd
));
bool
status
=
test
(
ha_rollback
(
thd
));
thd
->
options
&=
~
(
ulong
)
OPTION_BEGIN
;
thd
->
options
&=
~
(
ulong
)
OPTION_BEGIN
;
...
@@ -129,7 +137,6 @@ static bool xa_trans_rollback(THD *thd)
...
@@ -129,7 +137,6 @@ static bool xa_trans_rollback(THD *thd)
thd
->
server_status
&=
~
SERVER_STATUS_IN_TRANS
;
thd
->
server_status
&=
~
SERVER_STATUS_IN_TRANS
;
xid_cache_delete
(
&
thd
->
transaction
.
xid_state
);
xid_cache_delete
(
&
thd
->
transaction
.
xid_state
);
thd
->
transaction
.
xid_state
.
xa_state
=
XA_NOTR
;
thd
->
transaction
.
xid_state
.
xa_state
=
XA_NOTR
;
thd
->
transaction
.
xid_state
.
rm_error
=
0
;
return
status
;
return
status
;
}
}
...
...
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