mirror of
https://github.com/MariaDB/server.git
synced 2025-09-02 09:41:40 +03:00
feac078f15
(This commit is exclusively for 10.1 branch, do not merge it to upper ones)
In case of a pattern of non-STMT_END-marked Rows-log-event (A) followed by
a STMT_END marked one (B) mysqlbinlog mixes up the base64 encoded rows events
with their pseudo sql representation produced by the verbose option:
BINLOG '
base64 encoded data for A
### verbose section for A
base64 encoded data for B
### verbose section for B
'/*!*/;
In effect the produced BINLOG '...' query is not valid and is rejected with the error.
Examples of this way malformed BINLOG could have been found in binlog_row_annotate.result
that gets corrected with the patch.
The issue is fixed with introduction an auxiliary IO_CACHE to hold on the verbose
comments until the terminal STMT_END event is found. The new cache is emptied
out after two pre-existing ones are done at that time.
The correctly produced output now for the above case is as the following:
BINLOG '
base64 encoded data for A
base64 encoded data for B
'/*!*/;
### verbose section for A
### verbose section for B
Thanks to Alexey Midenkov for the problem recognition and attempt to tackle,
Venkatesh Duggirala who produced a patch for the upstream whose
idea is exploited here, as well as to MDEV-23077 reporter LukeXwang who
also contributed a piece of a patch aiming at this issue.
Extra: mysqlbinlog_row_minimal refined to not produce mutable numeric values into the result file.
51 lines
1.5 KiB
Plaintext
51 lines
1.5 KiB
Plaintext
--source include/have_debug.inc
|
|
--source include/have_binlog_format_row.inc
|
|
|
|
--let $MYSQLD_DATADIR= `select @@datadir`
|
|
|
|
CREATE TABLE t (a TEXT);
|
|
# events of interest are guaranteed to stay in 000001 log
|
|
RESET MASTER;
|
|
--eval INSERT INTO t SET a=repeat('a', 1024)
|
|
SELECT a from t into @a;
|
|
FLUSH LOGS;
|
|
DELETE FROM t;
|
|
|
|
--exec $MYSQL_BINLOG --verbose --debug-binlog-row-event-max-encoded-size=256 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog.sql
|
|
|
|
--let SEARCH_PATTERN= BINLOG @binlog_fragment_0, @binlog_fragment_1
|
|
--let SEARCH_FILE= $MYSQLTEST_VARDIR/tmp/mysqlbinlog.sql
|
|
--source include/search_pattern_in_file.inc
|
|
|
|
--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/mysqlbinlog.sql
|
|
|
|
SELECT a LIKE @a as 'true' FROM t;
|
|
|
|
# improper syntax error
|
|
--echo BINLOG number-of-fragments must be exactly two
|
|
--error ER_PARSE_ERROR
|
|
BINLOG @binlog_fragment;
|
|
--error ER_PARSE_ERROR
|
|
BINLOG @binlog_fragment, @binlog_fragment, @binlog_fragment;
|
|
|
|
# corrupted fragments error check (to the expected error code notice,
|
|
# the same error code occurs in a similar unfragmented case)
|
|
SET @binlog_fragment_0='012345';
|
|
SET @binlog_fragment_1='012345';
|
|
--error ER_SYNTAX_ERROR
|
|
BINLOG @binlog_fragment_0, @binlog_fragment_1;
|
|
|
|
# Not existing fragment is not allowed
|
|
SET @binlog_fragment_0='012345';
|
|
--error ER_WRONG_TYPE_FOR_VAR
|
|
BINLOG @binlog_fragment_0, @binlog_fragment_not_exist;
|
|
|
|
# MDEV-22520
|
|
SET @a= '42';
|
|
--error ER_SYNTAX_ERROR
|
|
BINLOG @a, @a;
|
|
|
|
--echo # Cleanup
|
|
--remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog.sql
|
|
DROP TABLE t;
|