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
ad1a3ce4
Commit
ad1a3ce4
authored
Aug 13, 2020
by
Kentoku SHIBA
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-19794 Spider crash with XA
parent
b01c4261
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
193 additions
and
4 deletions
+193
-4
storage/spider/mysql-test/spider/bugfix/include/xa_cmd_deinit.inc
...spider/mysql-test/spider/bugfix/include/xa_cmd_deinit.inc
+11
-0
storage/spider/mysql-test/spider/bugfix/include/xa_cmd_init.inc
...e/spider/mysql-test/spider/bugfix/include/xa_cmd_init.inc
+24
-0
storage/spider/mysql-test/spider/bugfix/r/xa_cmd.result
storage/spider/mysql-test/spider/bugfix/r/xa_cmd.result
+70
-0
storage/spider/mysql-test/spider/bugfix/t/xa_cmd.cnf
storage/spider/mysql-test/spider/bugfix/t/xa_cmd.cnf
+3
-0
storage/spider/mysql-test/spider/bugfix/t/xa_cmd.test
storage/spider/mysql-test/spider/bugfix/t/xa_cmd.test
+69
-0
storage/spider/spd_trx.cc
storage/spider/spd_trx.cc
+16
-4
No files found.
storage/spider/mysql-test/spider/bugfix/include/xa_cmd_deinit.inc
0 → 100644
View file @
ad1a3ce4
--
let
$MASTER_1_COMMENT_2_1
=
$MASTER_1_COMMENT_2_1_BACKUP
--
let
$CHILD2_1_DROP_TABLES
=
$CHILD2_1_DROP_TABLES_BACKUP
--
let
$CHILD2_1_CREATE_TABLES
=
$CHILD2_1_CREATE_TABLES_BACKUP
--
let
$CHILD2_1_SELECT_TABLES
=
$CHILD2_1_SELECT_TABLES_BACKUP
--
disable_warnings
--
disable_query_log
--
disable_result_log
--
source
../
t
/
test_deinit
.
inc
--
enable_result_log
--
enable_query_log
--
enable_warnings
storage/spider/mysql-test/spider/bugfix/include/xa_cmd_init.inc
0 → 100644
View file @
ad1a3ce4
--
disable_warnings
--
disable_query_log
--
disable_result_log
--
source
../
t
/
test_init
.
inc
--
enable_result_log
--
enable_query_log
--
enable_warnings
--
let
$MASTER_1_COMMENT_2_1_BACKUP
=
$MASTER_1_COMMENT_2_1
let
$MASTER_1_COMMENT_2_1
=
COMMENT
=
'table "tbl_a", srv "s_2_1"'
;
--
let
$CHILD2_1_DROP_TABLES_BACKUP
=
$CHILD2_1_DROP_TABLES
let
$CHILD2_1_DROP_TABLES
=
DROP
TABLE
IF
EXISTS
tbl_a
;
--
let
$CHILD2_1_CREATE_TABLES_BACKUP
=
$CHILD2_1_CREATE_TABLES
let
$CHILD2_1_CREATE_TABLES
=
CREATE
TABLE
tbl_a
(
pkey
int
NOT
NULL
,
PRIMARY
KEY
(
pkey
)
)
$CHILD2_1_ENGINE
$CHILD2_1_CHARSET
;
--
let
$CHILD2_1_SELECT_TABLES_BACKUP
=
$CHILD2_1_SELECT_TABLES
let
$CHILD2_1_SELECT_TABLES
=
SELECT
pkey
FROM
tbl_a
ORDER
BY
pkey
;
let
$CHILD2_1_SELECT_ARGUMENT1
=
SELECT
argument
FROM
mysql
.
general_log
WHERE
argument
LIKE
'%insert %'
;
storage/spider/mysql-test/spider/bugfix/r/xa_cmd.result
0 → 100644
View file @
ad1a3ce4
for master_1
for child2
child2_1
child2_2
child2_3
for child3
this test is for MDEV-19794
drop and create databases
connection master_1;
CREATE DATABASE auto_test_local;
USE auto_test_local;
connection child2_1;
SET @old_log_output = @@global.log_output;
SET GLOBAL log_output = 'TABLE,FILE';
CREATE DATABASE auto_test_remote;
USE auto_test_remote;
create table and insert
connection child2_1;
CHILD2_1_CREATE_TABLES
TRUNCATE TABLE mysql.general_log;
connection master_1;
CREATE TABLE tbl_a (
pkey int NOT NULL,
PRIMARY KEY (pkey)
) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1
connection child2_1;
TRUNCATE TABLE mysql.general_log;
connection master_1;
XA START 'test';
INSERT INTO tbl_a (pkey) VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
XA END 'test';
XA PREPARE 'test';
Warnings:
Warning 1030 Got error 131 "Command not supported by the engine" from storage engine Aria
XA COMMIT 'test';
connection child2_1;
SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
argument
insert into `auto_test_remote`.`tbl_a`(`pkey`)values(0),(1),(2),(3),(4),(5),(6),(7),(8),(9)
SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %'
SELECT pkey FROM tbl_a ORDER BY pkey;
pkey
0
1
2
3
4
5
6
7
8
9
deinit
connection master_1;
DROP DATABASE IF EXISTS auto_test_local;
connection child2_1;
DROP DATABASE IF EXISTS auto_test_remote;
SET GLOBAL log_output = @old_log_output;
for master_1
for child2
child2_1
child2_2
child2_3
for child3
end of test
storage/spider/mysql-test/spider/bugfix/t/xa_cmd.cnf
0 → 100644
View file @
ad1a3ce4
!include include/default_mysqld.cnf
!include ../my_1_1.cnf
!include ../my_2_1.cnf
storage/spider/mysql-test/spider/bugfix/t/xa_cmd.test
0 → 100644
View file @
ad1a3ce4
--
source
../
include
/
xa_cmd_init
.
inc
--
echo
--
echo
this
test
is
for
MDEV
-
19794
--
echo
--
echo
drop
and
create
databases
--
connection
master_1
--
disable_warnings
CREATE
DATABASE
auto_test_local
;
USE
auto_test_local
;
--
connection
child2_1
SET
@
old_log_output
=
@@
global
.
log_output
;
SET
GLOBAL
log_output
=
'TABLE,FILE'
;
CREATE
DATABASE
auto_test_remote
;
USE
auto_test_remote
;
--
enable_warnings
--
echo
--
echo
create
table
and
insert
--
connection
child2_1
--
disable_query_log
echo
CHILD2_1_CREATE_TABLES
;
eval
$CHILD2_1_CREATE_TABLES
;
--
enable_query_log
TRUNCATE
TABLE
mysql
.
general_log
;
--
connection
master_1
--
disable_query_log
echo
CREATE
TABLE
tbl_a
(
pkey
int
NOT
NULL
,
PRIMARY
KEY
(
pkey
)
)
MASTER_1_ENGINE
MASTER_1_CHARSET
MASTER_1_COMMENT_2_1
;
eval
CREATE
TABLE
tbl_a
(
pkey
int
NOT
NULL
,
PRIMARY
KEY
(
pkey
)
)
$MASTER_1_ENGINE
$MASTER_1_CHARSET
$MASTER_1_COMMENT_2_1
;
--
enable_query_log
--
connection
child2_1
TRUNCATE
TABLE
mysql
.
general_log
;
--
connection
master_1
XA
START
'test'
;
INSERT
INTO
tbl_a
(
pkey
)
VALUES
(
0
),(
1
),(
2
),(
3
),(
4
),(
5
),(
6
),(
7
),(
8
),(
9
);
XA
END
'test'
;
XA
PREPARE
'test'
;
XA
COMMIT
'test'
;
--
connection
child2_1
eval
$CHILD2_1_SELECT_ARGUMENT1
;
eval
$CHILD2_1_SELECT_TABLES
;
--
echo
--
echo
deinit
--
disable_warnings
--
connection
master_1
DROP
DATABASE
IF
EXISTS
auto_test_local
;
--
connection
child2_1
DROP
DATABASE
IF
EXISTS
auto_test_remote
;
SET
GLOBAL
log_output
=
@
old_log_output
;
--
enable_warnings
--
source
../
include
/
xa_cmd_deinit
.
inc
--
echo
--
echo
end
of
test
storage/spider/spd_trx.cc
View file @
ad1a3ce4
...
...
@@ -2294,7 +2294,10 @@ int spider_internal_xa_commit(
spider_close_sys_table
(
thd
,
table_xa
,
&
open_tables_backup
,
TRUE
);
table_xa_opened
=
FALSE
;
}
spider_xa_unlock
(
&
trx
->
internal_xid_state
);
if
(
trx
->
internal_xa
)
{
spider_xa_unlock
(
&
trx
->
internal_xid_state
);
}
DBUG_RETURN
(
0
);
error:
...
...
@@ -2304,7 +2307,10 @@ int spider_internal_xa_commit(
spider_close_sys_table
(
thd
,
table_xa_member
,
&
open_tables_backup
,
TRUE
);
error_in_commit:
error_open_table:
spider_xa_unlock
(
&
trx
->
internal_xid_state
);
if
(
trx
->
internal_xa
)
{
spider_xa_unlock
(
&
trx
->
internal_xid_state
);
}
DBUG_RETURN
(
error_num
);
}
...
...
@@ -2530,7 +2536,10 @@ int spider_internal_xa_rollback(
spider_close_sys_table
(
thd
,
table_xa
,
&
open_tables_backup
,
TRUE
);
table_xa_opened
=
FALSE
;
}
spider_xa_unlock
(
&
trx
->
internal_xid_state
);
if
(
trx
->
internal_xa
)
{
spider_xa_unlock
(
&
trx
->
internal_xid_state
);
}
DBUG_RETURN
(
0
);
error:
...
...
@@ -2540,7 +2549,10 @@ int spider_internal_xa_rollback(
spider_close_sys_table
(
thd
,
table_xa_member
,
&
open_tables_backup
,
TRUE
);
error_in_rollback:
error_open_table:
spider_xa_unlock
(
&
trx
->
internal_xid_state
);
if
(
trx
->
internal_xa
)
{
spider_xa_unlock
(
&
trx
->
internal_xid_state
);
}
DBUG_RETURN
(
error_num
);
}
...
...
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