mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
f9ac7032cb
always logged properly with binlog_row_image=MINIMAL
There are two issues fixed in this commit.
The first is an observation of a multi-table UPDATE binlogged
in row-format in binlog_row_image=MINIMAL mode. While the UPDATE aims
at a table with an ON-UPDATE attribute its binlog after-image misses
to record also installed default value.
The reason for that turns out missed marking of default-capable fields
in TABLE::write_set.
This is fixed to mark such fields similarly to 10.2's MDEV-10134 patch (db7edfed17)
that introduced it. The marking follows up 93d1e5ce0b841bed's idea
to exploit TABLE:rpl_write_set introduced there though,
and thus does not mess (in 10.1) with the actual MDEV-10134 agenda.
The patch makes formerly arg-less TABLE::mark_default_fields_for_write()
to accept an argument which would be TABLE:rpl_write_set.
The 2nd issue is extra columns in in binlog_row_image=MINIMAL before-image
while merely a packed primary key is enough. The test main.mysqlbinlog_row_minimal
always had a wrong result recorded.
This is fixed to invoke a function that intended for read_set
possible filtering and which is called (supposed to) in all type of MDL, UPDATE
including; the test results have gotten corrected.
At *merging* from 10.1->10.2 the 1st "main" part of the patch is unnecessary
since the bug is not observed in 10.2, so only hunks from
sql/sql_class.cc
are required.
74 lines
2.5 KiB
Text
74 lines
2.5 KiB
Text
#
|
|
# Test for minimal row format
|
|
#
|
|
|
|
--source include/have_log_bin.inc
|
|
--source include/have_binlog_format_row.inc
|
|
|
|
#
|
|
# MDEV-8426
|
|
# mysqlbinlog: "Corrupted replication event was detected. Not printing the
|
|
# value" with binlog-row-image=minimal
|
|
#
|
|
|
|
CREATE TABLE t1 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 TINYINT, f4 MEDIUMINT, f5 BIGINT, f6 INT, f7 INT, f8 char(1));
|
|
CREATE TABLE t2 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 INT, f4 INT, f5 MEDIUMINT, f6 INT, f7 INT, f8 char(1));
|
|
INSERT INTO t1 VALUES (10, 1, 2, 3, 4, 5, 6, 7, "");
|
|
INSERT INTO t1 VALUES (11, 1, 2, 3, 4, 5, 6, 7, NULL);
|
|
INSERT INTO t1 VALUES (12, 1, 2, 3, NULL, 5, 6, 7, "A");
|
|
INSERT INTO t1 VALUES (13, 1, 2, 3, 0, 5, 6, 7, "A");
|
|
INSERT INTO t2 SELECT * FROM t1;
|
|
UPDATE t2 SET f4=5 WHERE f4>0 or f4 is NULL;
|
|
DELETE FROM t1;
|
|
DELETE FROM t2;
|
|
|
|
--let $binlog = query_get_value(SHOW MASTER STATUS, File, 1)
|
|
--let $datadir = `SELECT @@datadir`
|
|
|
|
FLUSH BINARY LOGS;
|
|
|
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
|
--replace_regex /\d{6} *\d*:\d\d:\d\d/<date>/ /Start:.*at startup/Start: xxx/ /SET TIMESTAMP=\d*/SET TIMESTAMP=X/ /exec_time=\d*/exec_time=x/
|
|
--exec $MYSQL_BINLOG --verbose --verbose --base64-output=DECODE-ROWS $datadir/$binlog
|
|
|
|
DROP TABLE t1,t2;
|
|
|
|
#
|
|
# MDEV-14605 ON UPDATE CURRENT_TIMESTAMP fields by multi-table UPDATE are not logged with binlog_row_image=MINIMAL
|
|
#
|
|
|
|
CREATE TABLE `t1` (
|
|
|
|
`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
|
|
`is_deleted` BIT(1) DEFAULT b'0',
|
|
`last_updated` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
|
`ref_id` BIGINT(20) UNSIGNED NOT NULL,
|
|
PRIMARY KEY (`id`),
|
|
KEY `last_updated_KEY` (`last_updated`)
|
|
);
|
|
|
|
CREATE TABLE `t2` (
|
|
`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
|
|
`short_desc` VARCHAR(50) NOT NULL,
|
|
PRIMARY KEY (`id`)
|
|
);
|
|
|
|
|
|
INSERT INTO t2 (id, short_desc) VALUES (1, 'test');
|
|
INSERT INTO t1 (id, is_deleted, ref_id) VALUES (1, b'0', 1);
|
|
FLUSH BINARY LOGS;
|
|
--let $binlog_pos= query_get_value(SHOW MASTER STATUS, Position, 1)
|
|
|
|
UPDATE t1 t1 INNER JOIN t2 t2 ON t1.ref_id = t2.id
|
|
SET t1.is_deleted = TRUE
|
|
WHERE t1.id = 1;
|
|
|
|
--let $binlog = query_get_value(SHOW MASTER STATUS, File, 1)
|
|
|
|
FLUSH BINARY LOGS;
|
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
|
--replace_regex /\d{6} *\d*:\d\d:\d\d/<date>/ /SET TIMESTAMP=\d*/SET TIMESTAMP=X/ /exec_time=\d*/exec_time=x/ /@3=\d*/@3=X/ /CRC32 0x[0-9a-f]+/CRC32 XXX/
|
|
--exec $MYSQL_BINLOG --verbose --verbose --base64-output=DECODE-ROWS $datadir/$binlog --start-position=$binlog_pos
|
|
|
|
DROP TABLE t1,t2;
|
|
|