mirror of
https://github.com/MariaDB/server.git
synced 2025-10-24 16:38:14 +02:00
4102f1589c
MDEV-22531 Remove maria::implicit_commit()
MDEV-22607 Assertion `ha_info->ht() != binlog_hton' failed in
MYSQL_BIN_LOG::unlog_xa_prepare
From the handler point of view, Aria now looks like a transactional
engine. One effect of this is that we don't need to call
maria::implicit_commit() anymore.
This change also forces the server to call trans_commit_stmt() after doing
any read or writes to system tables. This work will also make it easier
to later allow users to have system tables in other engines than Aria.
To handle the case that Aria doesn't support rollback, a new
handlerton flag, HTON_NO_ROLLBACK, was added to engines that has
transactions without rollback (for the moment only binlog and Aria).
Other things
- Moved freeing of MARIA_SHARE to a separate function as the MARIA_SHARE
can be still part of a transaction even if the table has closed.
- Changed Aria checkpoint to use the new MARIA_SHARE free function. This
fixes a possible memory leak when using S3 tables
- Changed testing of binlog_hton to instead test for HTON_NO_ROLLBACK
- Removed checking of has_transaction_manager() in handler.cc as we can
assume that as the transaction was started by the engine, it does
support transactions.
- Added new class 'start_new_trans' that can be used to start indepdendent
sub transactions, for example while reading mysql.proc, using help or
status tables etc.
- open_system_tables...() and open_proc_table_for_Read() doesn't anymore
take a Open_tables_backup list. This is now handled by 'start_new_trans'.
- Split thd::has_transactions() to thd::has_transactions() and
thd::has_transactions_and_rollback()
- Added handlerton code to free cached transactions objects.
Needed by InnoDB.
squash! 2ed35999f2a2d84f1c786a21ade5db716b6f1bbc
61 lines
1.1 KiB
Text
61 lines
1.1 KiB
Text
--source include/have_innodb.inc
|
|
--source include/have_log_bin.inc
|
|
|
|
CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
|
|
|
|
# Fix binlog format (otherwise SHOW BINLOG EVENTS will fluctuate).
|
|
SET binlog_format= mixed;
|
|
|
|
RESET MASTER;
|
|
|
|
XA START 'xatest';
|
|
INSERT INTO t1 VALUES (1);
|
|
XA END 'xatest';
|
|
XA PREPARE 'xatest';
|
|
XA COMMIT 'xatest';
|
|
|
|
XA START 'xatest';
|
|
INSERT INTO t1 VALUES (2);
|
|
XA END 'xatest';
|
|
XA COMMIT 'xatest' ONE PHASE;
|
|
|
|
BEGIN;
|
|
INSERT INTO t1 VALUES (3);
|
|
COMMIT;
|
|
|
|
SELECT * FROM t1 ORDER BY a;
|
|
DROP TABLE t1;
|
|
|
|
#
|
|
# MDEV-22607 Assertion `ha_info->ht() != binlog_hton' failed in
|
|
# MYSQL_BIN_LOG::unlog_xa_prepare
|
|
#
|
|
|
|
CREATE TABLE t1 (a INT) ENGINE=Aria;
|
|
INSERT INTO t1 VALUES (1),(2);
|
|
XA BEGIN 'x';
|
|
DELETE FROM t1;
|
|
XA END 'x';
|
|
XA PREPARE 'x';
|
|
|
|
# Cleanup
|
|
XA COMMIT 'x';
|
|
|
|
SELECT * from t1;
|
|
|
|
XA BEGIN 'x';
|
|
INSERT INTO t1 VALUES (3),(4);
|
|
XA END 'x';
|
|
XA PREPARE 'x';
|
|
XA ROLLBACK 'x';
|
|
|
|
SELECT * from t1;
|
|
DROP TABLE t1;
|
|
|
|
#
|
|
# Time to check the log
|
|
#
|
|
|
|
--replace_column 2 # 5 #
|
|
--replace_regex /xid=[0-9]+/xid=XX/ /GTID [0-9]+-[0-9]+-[0-9]+/GTID #-#-#/
|
|
SHOW BINLOG EVENTS LIMIT 3,100;
|