mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 23:04:20 +01:00
5cc348a6a6
Problem: it is unsafe to read base64-printed events without first
reading the Format_description_log_event (FD). Currently, mysqlbinlog
cannot print the FD.
As a side effect, another bug has also been fixed: When mysqlbinlog
--start-position=X was specified, no ROLLBACK was printed. I changed
this, so that ROLLBACK is always printed.
This patch does several things:
- Format_description_log_event (FD) now print themselves in base64
format.
- mysqlbinlog is now able to print FD events. It has three modes:
--base64-output=auto Print row events in base64 output, and print
FD event. The FD event is printed even if
it is outside the range specified with
--start-position, because it would not be
safe to read row events otherwise. This is
the default.
--base64-output=always Like --base64-output=auto, but also print
base64 output for query events. This is
like the old --base64-output flag, which
is also a shorthand for
--base64-output=always
--base64-output=never Never print base64 output, generate error if
row events occur in binlog. This is
useful to suppress the FD event in binlogs
known not to contain row events (e.g.,
because BINLOG statement is unsafe,
requires root privileges, is not SQL, etc)
- the BINLOG statement now handles FD events correctly, by setting
the thread's rli's relay log's description_event_for_exec to the
loaded event.
In fact, executing a BINLOG statement is almost the same as reading
an event from a relay log. Before my patch, the code for this was
separated (exec_relay_log_event in slave.cc executes events from
the relay log, mysql_client_binlog_statement in sql_binlog.cc
executes BINLOG statements). I needed to augment
mysql_client_binlog_statement to do parts of what
exec_relay_log_event does. Hence, I did a small refactoring and
moved parts of exec_relay_log_event to a new function, which I
named apply_event_and_update_pos. apply_event_and_update_pos is
called both from exec_relay_log_event and from
mysql_client_binlog_statement.
- When a non-FD event is executed in a BINLOG statement, without
previously executing a FD event in a BINLOG statement, it generates
an error, because that's unsafe. I took a new error code for that:
ER_NO_FORMAT_DESCRIPTION_EVENT_BEFORE_BINLOG_STATEMENTS.
In order to get a decent error message containing the name of the
event, I added the class method char*
Log_event::get_type_str(Log_event_type type), which returns a
string name for the given Log_event_type. This is just like the
existing char* Log_event::get_type_str(), except it is a class
method that takes the log event type as parameter.
I also added PRE_GA_*_ROWS_LOG_EVENT to Log_event::get_type_str(),
so that names of old rows event are properly printed.
- When reading an event, I added a check that the event type is known
by the current Format_description_log_event. Without this, it may
crash on bad input (and I was struck by this several times).
- I patched the following test cases, which all contain BINLOG
statements for row events which must be preceded by BINLOG
statements for FD events:
- rpl_bug31076
While I was here, I fixed some small things in log_event.cc:
- replaced hard-coded 4 by EVENT_TYPE_OFFSET in 3 places
- replaced return by DBUG_VOID_RETURN in one place
- The name of the logfile can be '-' to indicate stdin. Before my
patch, the code just checked if the first character is '-'; now it
does a full strcmp(). Probably, all arguments that begin with a -
are already handled somewhere else as flags, but I still think it
is better that the code reflects what it is supposed to do, with as
little dependencies as possible on other parts of the code. If we
one day implement that all command line arguments after -- are
files (as most unix tools do), then we need this.
I also fixed the following in slave.cc:
- next_event() was declared twice, and queue_event was not static but
should be static (not used outside the file).
102 lines
3.6 KiB
Text
102 lines
3.6 KiB
Text
# This test case verifies that the mysqlbinlog --base64-output=X flags
|
|
# work as expected, and that BINLOG statements with row events fail if
|
|
# they are not preceded by BINLOG statements with Format description
|
|
# events.
|
|
#
|
|
# See also BUG#32407.
|
|
|
|
|
|
# Test to show BUG#32407. This reads a binlog created with the
|
|
# mysql-5.1-telco-6.1 tree, specifically at the tag
|
|
# mysql-5.1.15-ndb-6.1.23, and applies it to the database. The test
|
|
# should fail before BUG#32407 was fixed and succeed afterwards.
|
|
--echo ==== Test BUG#32407 ====
|
|
|
|
# The binlog contains row events equivalent to:
|
|
# CREATE TABLE t1 (a int) engine = myisam
|
|
# INSERT INTO t1 VALUES (1), (1)
|
|
exec $MYSQL_BINLOG suite/binlog/std_data/binlog-bug32407.000001 | $MYSQL;
|
|
# The above line should succeed and t1 should contain two ones
|
|
select * from t1;
|
|
|
|
|
|
# Test that a BINLOG statement encoding a row event fails unless a
|
|
# Format_description_event as been supplied with an earlier BINLOG
|
|
# statement.
|
|
--echo ==== Test BINLOG statement w/o FD event ====
|
|
|
|
# This is a binlog statement consisting of one Table_map_log_event and
|
|
# one Write_rows_log_event. Together, they correspond to the
|
|
# following query:
|
|
# INSERT INTO TABLE test.t1 VALUES (2)
|
|
|
|
error ER_NO_FORMAT_DESCRIPTION_EVENT_BEFORE_BINLOG_STATEMENT;
|
|
BINLOG '
|
|
SVtYRxMBAAAAKQAAADQBAAAAABAAAAAAAAAABHRlc3QAAnQxAAEDAAE=
|
|
SVtYRxcBAAAAIgAAAFYBAAAQABAAAAAAAAEAAf/+AgAAAA==
|
|
';
|
|
# The above line should fail and 2 should not be in the table
|
|
select * from t1;
|
|
|
|
|
|
# Test that it works to read a Format_description_log_event with a
|
|
# BINLOG statement, followed by a row-event in base64 from the same
|
|
# version.
|
|
--echo ==== Test BINLOG statement with FD event ====
|
|
|
|
# This is a binlog statement containing a Format_description_log_event
|
|
# from the same version as the Table_map and Write_rows_log_event.
|
|
BINLOG '
|
|
ODdYRw8BAAAAZgAAAGoAAAABAAQANS4xLjIzLXJjLWRlYnVnLWxvZwAAAAAAAAAAAAAAAAAAAAAA
|
|
AAAAAAAAAAAAAAAAAAA4N1hHEzgNAAgAEgAEBAQEEgAAUwAEGggAAAAICAgC
|
|
';
|
|
|
|
# This is a Table_map_log_event+Write_rows_log_event corresponding to:
|
|
# INSERT INTO TABLE test.t1 VALUES (3)
|
|
BINLOG '
|
|
TFtYRxMBAAAAKQAAAH8BAAAAABAAAAAAAAAABHRlc3QAAnQxAAEDAAE=
|
|
TFtYRxcBAAAAIgAAAKEBAAAQABAAAAAAAAEAAf/+AwAAAA==
|
|
';
|
|
# The above line should succeed and 3 should be in the table
|
|
select * from t1;
|
|
|
|
|
|
# Test that mysqlbinlog stops with an error message when the
|
|
# --base64-output=never flag is used on a binlog with base64 events.
|
|
--echo ==== Test --base64-output=never on a binlog with row events ====
|
|
|
|
# mysqlbinlog should fail
|
|
--replace_regex /#[0-9][0-9][0-9][0-9][0-9][0-9] .*/#/
|
|
error 1;
|
|
exec $MYSQL_BINLOG --base64-output=never suite/binlog/std_data/binlog-bug32407.000001;
|
|
# the above line should output the query log event and then stop
|
|
|
|
|
|
# Test that the following fails cleanly: "First, read a
|
|
# Format_description event which has N event types. Then, read an
|
|
# event of type M>N"
|
|
--echo ==== Test non-matching FD event and Row event ====
|
|
|
|
# This is the Format_description_log_event from
|
|
# binlog-bug32407.000001, encoded in base64. It contains only the old
|
|
# row events (number of event types is 22)
|
|
BINLOG '
|
|
4CdYRw8BAAAAYgAAAGYAAAAAAAQANS4xLjE1LW5kYi02LjEuMjQtZGVidWctbG9nAAAAAAAAAAAA
|
|
AAAAAAAAAAAAAAAAAADgJ1hHEzgNAAgAEgAEBAQEEgAATwAEGggICAg=
|
|
';
|
|
|
|
# The following is a Write_rows_log_event with event type 23, i.e.,
|
|
# not supported by the Format_description_log_event above. It
|
|
# corresponds to the following query:
|
|
# INSERT INTO t1 VALUES (5)
|
|
error 1149;
|
|
BINLOG '
|
|
Dl1YRxMBAAAAKQAAADQBAAAAABAAAAAAAAAABHRlc3QAAnQxAAEDAAE=
|
|
Dl1YRxcBAAAAIgAAAFYBAAAQABAAAAAAAAEAAf/+BQAAAA==
|
|
';
|
|
# the above line should fail and 5 should not be in the binlog.
|
|
select * from t1;
|
|
|
|
|
|
# clean up
|
|
drop table t1;
|