mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-35046 SIGSEGV in list_delete in optimized builds when using pseudo_slave_mode

Browse source 
slave_applier_reset_xa_trans() should clear the THD::pseudo_thread_id when called
to reset XA transaction state completely.  Clearing when pseudo_thread_id models
the binlog applier that handles BASE64-encoded events which possibly contain the
pseudo_thread_id, allowing us to restore the pre-event's state of the
connection's respective session var.
This commit is contained in:
Dave Gosselin 2024-11-14 11:48:30 -05:00 • committed by Dave Gosselin
parent 41f54da46f
commit 3f114a0930
6 changed files with 47 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
mysql-test/main/mdev-35046.result Normal file
View file

@ -0,0 +1,17 @@
SET pseudo_slave_mode=1;
CREATE TABLE t1 (c INT) ENGINE=InnoDB;
CREATE TABLE t2 (c INT) ENGINE=MEMORY;
XA START 'a';
INSERT INTO t1 VALUES (0);
CREATE TEMPORARY TABLE t1t (c INT) ENGINE=InnoDB;
INSERT INTO t1t VALUES (0);
XA END 'a';
XA PREPARE 'a';
OPTIMIZE TABLE t1t;
Table Op Msg_type Msg_text
test.t1t optimize Error Table 'test.t1t' doesn't exist
test.t1t optimize status Operation failed
LOCK TABLE t2 READ;
XA COMMIT 'a';
# restart
DROP TABLE t1, t2;

19
mysql-test/main/mdev-35046.test Normal file
View file

@ -0,0 +1,19 @@
#
# MDEV-35046 SIGSEGV in list_delete in optimized builds when using pseudo_slave_mode
# https://jira.mariadb.org/browse/MDEV-35046
#
--source include/have_innodb.inc
SET pseudo_slave_mode=1;
CREATE TABLE t1 (c INT) ENGINE=InnoDB;
CREATE TABLE t2 (c INT) ENGINE=MEMORY;
XA START 'a';
INSERT INTO t1 VALUES (0);
CREATE TEMPORARY TABLE t1t (c INT) ENGINE=InnoDB;
INSERT INTO t1t VALUES (0);
XA END 'a';
XA PREPARE 'a';
OPTIMIZE TABLE t1t;
LOCK TABLE t2 READ;
XA COMMIT 'a';
--source include/restart_mysqld.inc
DROP TABLE t1, t2;

2
mysql-test/suite/rpl/r/rpl_xa.result
View file

@ -29,6 +29,8 @@ xa start 's';
insert into t2 values (0);
xa end 's';
xa prepare 's';
Warnings:
Warning 4196 Pseudo thread id should not be modified by the client as it will be overwritten
include/save_master_gtid.inc
connection slave;
include/sync_with_master_gtid.inc

2
mysql-test/suite/rpl/r/rpl_xa_gtid_pos_auto_engine.result
View file

@ -35,6 +35,8 @@ xa start 's';
insert into t2 values (0);
xa end 's';
xa prepare 's';
Warnings:
Warning 4196 Pseudo thread id should not be modified by the client as it will be overwritten
include/save_master_gtid.inc
connection slave;
include/sync_with_master_gtid.inc

2
sql/share/errmsg-utf8.txt
View file

@ -12270,3 +12270,5 @@ ER_JSON_SCHEMA_KEYWORD_UNSUPPORTED
sw "%s neno kuu halitumiki"
ER_JSON_NO_VARIABLE_SCHEMA
eng "Variable schema is not supported."
ER_PSEUDO_THREAD_ID_OVERWRITE
eng "Pseudo thread id should not be modified by the client as it will be overwritten"

5
sql/xa.cc
View file

@ -1196,5 +1196,10 @@ static bool slave_applier_reset_xa_trans(THD *thd)
thd->has_waiter= false;
MYSQL_COMMIT_TRANSACTION(thd->m_transaction_psi); // TODO/Fixme: commit?
thd->m_transaction_psi= NULL;
if (thd->variables.pseudo_slave_mode && thd->variables.pseudo_thread_id == 0)
push_warning(thd, Sql_condition::WARN_LEVEL_WARN,
ER_PSEUDO_THREAD_ID_OVERWRITE,
ER_THD(thd, ER_PSEUDO_THREAD_ID_OVERWRITE));
thd->variables.pseudo_thread_id= 0;
return thd->is_error();
}