Skip to content

MDEV-38796 Refactor: clean up THD::decide_logging_format() checks #5136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bnestere wants to merge 6 commits into
base: gtt-monty
Choose a base branch
from
+744 −137
Open

MDEV-38796 Refactor: clean up THD::decide_logging_format() checks #5136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ed7f657
MDEV-38796 Test updates for forced row logging
bnestere May 27, 2026
ec517d4
MDEV-38796 Update BINLOG_STATE_FILTER at DB change time
bnestere May 27, 2026
7fe6738
MDEV-38796 Remove *_binlog_local_stmt_filter()
bnestere May 27, 2026
53c847f
MDEV-38796 Remove silent option from mysql_create_db_internal
bnestere May 28, 2026
f7a90e8
MDEV-38796 Replace mysql_bin_log.is_open with binlog_ready()
bnestere May 28, 2026
423acf7
MDEV-38796: Fix Windows compiler error
bnestere Jul 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
183 changes: 183 additions & 0 deletions mysql-test/suite/binlog/r/binlog_close_during_commit.result
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,183 @@
call mtr.add_suppression("\\[ERROR\\] Error writing file '.*master-bin.*' .*errno: 9");
call mtr.add_suppression("\\[ERROR\\] Error writing file");
call mtr.add_suppression("\\[ERROR\\] Could not use");
#
# Sub-case 1: DML on a transactional table
#
connection default;
create table t_trans (id int primary key) engine=innodb;
create table t2 (id int primary key) engine=innodb;
connect con1,localhost,root,,test;
connect con3,localhost,root,,test;
connection con1;
SET DEBUG_SYNC= 'commit_after_binlog_ready_before_LOCK_log SIGNAL paused WAIT_FOR go';
SET DEBUG_DBUG= '+d,commit_after_binlog_ready_before_LOCK_log';
insert into t_trans values (1);
connection default;
SET DEBUG_SYNC= 'now WAIT_FOR paused';
# Trigger the binlog error and permanent closure via a failed rotation
SET DEBUG_DBUG= '+d,fault_injection_new_file_rotate_event';
FLUSH LOGS;
ERROR HY000: Can't open file: 'master-bin' (errno: 2 "No such file or directory")
# Ensure binary logging disables for the rest of the server lifespan
NOT FOUND matches in mysqld.1.err
SET DEBUG_DBUG= '';
SET DEBUG_SYNC= 'now SIGNAL go';
connection con1;
connection default;
# con1's statement must have committed in the engine
select * from t_trans;
id
1
# A follow-up commit on a third connection must also succeed without
# logging another ER_ERROR_ON_WRITE
connection con3;
insert into t2 values (102);
select * from t2 order by id;
id
102
disconnect con1;
disconnect con3;
connection default;
drop table t_trans, t2;
# restart
#
# Sub-case 2: DML on a non-transactional table
#
connection default;
create table t_myisam (id int primary key) engine=myisam;
create table t2 (id int primary key) engine=innodb;
connect con1,localhost,root,,test;
connect con3,localhost,root,,test;
connection con1;
SET DEBUG_SYNC= 'commit_after_binlog_ready_before_LOCK_log SIGNAL paused WAIT_FOR go';
insert into t_myisam values (1);
connection default;
SET DEBUG_SYNC= 'now WAIT_FOR paused';
# Trigger the binlog error and permanent closure via a failed rotation
SET DEBUG_DBUG= '+d,fault_injection_new_file_rotate_event';
FLUSH LOGS;
ERROR HY000: Can't open file: 'master-bin' (errno: 2 "No such file or directory")
# Ensure binary logging disables for the rest of the server lifespan
NOT FOUND matches in mysqld.1.err
SET DEBUG_DBUG= '';
SET DEBUG_SYNC= 'now SIGNAL go';
connection con1;
connection default;
# con1's statement must have committed in the engine
select * from t_myisam;
id
1
connection con3;
insert into t2 values (202);
select * from t2 order by id;
id
202
disconnect con1;
disconnect con3;
connection default;
drop table t_myisam, t2;
# restart
#
# Sub-case 3: Multi-table UPDATE on trans + non-trans
#
connection default;
create table t_trans (id int primary key, v int) engine=innodb;
create table t_myisam (id int primary key, v int) engine=myisam;
create table t2 (id int primary key) engine=innodb;
insert into t_trans values (1, 0), (2, 0);
insert into t_myisam values (1, 0), (2, 0);
connect con1,localhost,root,,test;
connect con3,localhost,root,,test;
connection con1;
SET DEBUG_SYNC= 'commit_after_binlog_ready_before_LOCK_log SIGNAL paused WAIT_FOR go';
update t_trans, t_myisam set t_trans.v = 1, t_myisam.v = 1 where t_trans.id = t_myisam.id;
connection default;
SET DEBUG_SYNC= 'now WAIT_FOR paused';
# Trigger the binlog error and permanent closure via a failed rotation
SET DEBUG_DBUG= '+d,fault_injection_new_file_rotate_event';
FLUSH LOGS;
ERROR HY000: Can't open file: 'master-bin' (errno: 2 "No such file or directory")
# Ensure binary logging disables for the rest of the server lifespan
NOT FOUND matches in mysqld.1.err
SET DEBUG_DBUG= '';
SET DEBUG_SYNC= 'now SIGNAL go';
connection con1;
connection default;
# con1's statement must have committed in the engine
select * from t_trans order by id;
id v
1 1
2 1
select * from t_myisam order by id;
id v
1 1
2 1
# con2's (default conn's) statement must have committed in the engine
select * from t2;
id
connection con3;
insert into t2 values (302);
select * from t2 order by id;
id
302
disconnect con1;
disconnect con3;
connection default;
drop table t_trans, t_myisam, t2;
# restart
#
# Sub-case 4: DML selecting from a temporary table
#
connection default;
create table t_trans (id int primary key) engine=innodb;
create table t2 (id int primary key) engine=innodb;
connect con1,localhost,root,,test;
connect con3,localhost,root,,test;
connection con1;
create temporary table t_tmp (id int primary key) engine=innodb;
insert into t_tmp values (1);
SET DEBUG_SYNC= 'commit_after_binlog_ready_before_LOCK_log SIGNAL paused WAIT_FOR go';
insert into t_trans (id) select id from t_tmp;
connection default;
SET DEBUG_SYNC= 'now WAIT_FOR paused';
# Trigger the binlog error and permanent closure via a failed rotation
SET DEBUG_DBUG= '+d,fault_injection_new_file_rotate_event';
FLUSH LOGS;
ERROR HY000: Can't open file: 'master-bin' (errno: 2 "No such file or directory")
# Ensure binary logging disables for the rest of the server lifespan
NOT FOUND matches in mysqld.1.err
SET DEBUG_DBUG= '';
SET DEBUG_SYNC= 'now SIGNAL go';
connection con1;
# con1's statement must have committed in the engine
select * from t_tmp;
id
1
select * from t_trans;
id
1
drop temporary table t_tmp;
connection default;
# con2's (default conn's) statement must have committed in the engine
select * from t2;
id
connection con3;
insert into t2 values (402);
select * from t2 order by id;
id
402
disconnect con1;
disconnect con3;
connection default;
drop table t_trans, t2;
# restart
#
# Sub-case 5: DDL (CREATE TABLE)
# TODO: Fill in this test case with MDEV-40171
#
#
# Cleanup
#
SET DEBUG_SYNC= 'RESET';
# End of binlog_close_during_commit.test
23 changes: 13 additions & 10 deletions mysql-test/suite/binlog/r/binlog_spurious_ddl_errors.result
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,28 @@
SET @old_binlog_format= @@global.binlog_format;
INSTALL PLUGIN example SONAME 'ha_example';
################################################################################
# Verifies if ER_BINLOG_STMT_MODE_AND_ROW_ENGINE happens by setting the binlog
# format to STATEMENT and the transaction isolation level to READ COMMITTED as
# such changes force Innodb to accept changes in the row format.
#
# When CREATE TABLE, ALTER TABLE, CREATE INDEX and CREATE TRIGGER are executed
# any error should be triggered.
#
# In contrast, CREATE TABLE ... SELECT should trigger the following error:
# ER_BINLOG_STMT_MODE_AND_ROW_ENGINE.
# If the binlog format is set to STATEMENT and the transaction isolation
# level to READ COMMITTED, InnoDB must override the STATEMENT format
# configuration and write using ROW format.
################################################################################
SET binlog_format = STATEMENT;
SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
CREATE TABLE t_row (a VARCHAR(100)) ENGINE = InnoDB;
SET statement binlog_format = row for insert into t_row values ('a'), ('b'), ('c');
ALTER TABLE t_row ADD COLUMN b INT;
CREATE TRIGGER trig_row BEFORE INSERT ON t_row FOR EACH ROW INSERT INTO t_stmt VALUES (1);
CREATE INDEX i ON t_row(a);
# Flush binlogs to ensure the next statement can be analyzed alone
FLUSH BINARY LOGS;
CREATE TABLE t_row_new ENGINE = InnoDB SELECT * FROM t_row;
ERROR HY000: Cannot execute statement: impossible to write to binary log since BINLOG_FORMAT = STATEMENT and at least one table uses a storage engine limited to row-based logging.
Warnings:
Note 1665 Statement cannot be logged as STATEMENT as at least one table is limited to row-based logging. Switching temporarly to row format
FLUSH BINARY LOGS;
# MYSQL_BINLOG binlog_file --result-file=binlog_out --base64-output=never --verbose
include/assert_grep.inc [Ensure CREATE TABLE ... SELECT in STATEMENT uses ROW binlogging when InnoDB cannot log using STATEMENT format]
include/assert_grep.inc [Ensure CREATE TABLE ... SELECT in STATEMENT writes all rows when InnoDB cannot log using STATEMENT format]
DROP TABLE t_row;
DROP TABLE t_row_new;


################################################################################
Expand Down
Loading
Loading