mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 14:54: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).
172 lines
7.4 KiB
Text
172 lines
7.4 KiB
Text
# Test for the new options --start-datetime, stop-datetime,
|
|
# and a few others.
|
|
|
|
# TODO: Need to look at making row based version once new binlog client is complete.
|
|
-- source include/have_binlog_format_mixed_or_statement.inc
|
|
|
|
|
|
--disable_warnings
|
|
drop table if exists t1;
|
|
--enable_warnings
|
|
reset master;
|
|
|
|
# We need this for getting fixed timestamps inside of this test.
|
|
# I use a date in the future to keep a growing timestamp along the
|
|
# binlog (including the Start_log_event). This test will work
|
|
# unchanged everywhere, because mysql-test-run has fixed TZ, which it
|
|
# exports (so mysqlbinlog has same fixed TZ).
|
|
set @a=UNIX_TIMESTAMP("2020-01-21 15:32:22");
|
|
set timestamp=@a;
|
|
create table t1 (a int auto_increment not null primary key, b char(3));
|
|
insert into t1 values(null, "a");
|
|
insert into t1 values(null, "b");
|
|
set timestamp=@a+2;
|
|
insert into t1 values(null, "c");
|
|
set timestamp=@a+4;
|
|
insert into t1 values(null, "d");
|
|
insert into t1 values(null, "e");
|
|
|
|
flush logs;
|
|
set timestamp=@a+1; # this could happen on a slave
|
|
insert into t1 values(null, "f");
|
|
|
|
# delimiters are for easier debugging in future
|
|
|
|
--disable_query_log
|
|
select "--- Local --" as "";
|
|
--enable_query_log
|
|
|
|
#
|
|
# We should use --short-form everywhere because in other case output will
|
|
# be time dependent (the Start events). Better than nothing.
|
|
#
|
|
|
|
--replace_regex /[[:<:]][0-9]{6} [0-9 ][0-9]:[0-9]{2}:[0-9]{2}[[:>:]]/{yymmdd} {HH:MM:SS}/ /=[0-9]+ /={integer} / /# at [0-9]+/# at {pos}/ /(pos:?) [0-9]+/\1 {pos}/ /binlog v [0-9]+, server v [^ ]* created/binlog v #, server v ## created/
|
|
--exec $MYSQL_BINLOG --base64-output=never $MYSQLTEST_VARDIR/log/master-bin.000001
|
|
|
|
--disable_query_log
|
|
select "--- offset --" as "";
|
|
--enable_query_log
|
|
--exec $MYSQL_BINLOG --short-form --offset=2 $MYSQLTEST_VARDIR/log/master-bin.000001
|
|
--disable_query_log
|
|
select "--- start-position --" as "";
|
|
--enable_query_log
|
|
--exec $MYSQL_BINLOG --short-form --start-position=608 $MYSQLTEST_VARDIR/log/master-bin.000001
|
|
--disable_query_log
|
|
select "--- stop-position --" as "";
|
|
--enable_query_log
|
|
--exec $MYSQL_BINLOG --short-form --stop-position=608 $MYSQLTEST_VARDIR/log/master-bin.000001
|
|
--disable_query_log
|
|
select "--- start and stop positions ---" as "";
|
|
--enable_query_log
|
|
--exec $MYSQL_BINLOG --short-form --start-position=608 --stop-position 725 $MYSQLTEST_VARDIR/log/master-bin.000001
|
|
--disable_query_log
|
|
select "--- start-datetime --" as "";
|
|
--enable_query_log
|
|
--exec $MYSQL_BINLOG --short-form "--start-datetime=2020-01-21 15:32:24" $MYSQLTEST_VARDIR/log/master-bin.000001
|
|
--disable_query_log
|
|
select "--- stop-datetime --" as "";
|
|
--enable_query_log
|
|
--exec $MYSQL_BINLOG --short-form "--stop-datetime=2020-01-21 15:32:24" $MYSQLTEST_VARDIR/log/master-bin.000001
|
|
|
|
--disable_query_log
|
|
select "--- Local with 2 binlogs on command line --" as "";
|
|
--enable_query_log
|
|
|
|
# This is to verify that some options apply only to first, or last binlog
|
|
|
|
flush logs;
|
|
--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000001 $MYSQLTEST_VARDIR/log/master-bin.000002
|
|
|
|
--disable_query_log
|
|
select "--- offset --" as "";
|
|
--enable_query_log
|
|
--exec $MYSQL_BINLOG --short-form --offset=2 $MYSQLTEST_VARDIR/log/master-bin.000001 $MYSQLTEST_VARDIR/log/master-bin.000002
|
|
--disable_query_log
|
|
select "--- start-position --" as "";
|
|
--enable_query_log
|
|
--exec $MYSQL_BINLOG --short-form --start-position=608 $MYSQLTEST_VARDIR/log/master-bin.000001 $MYSQLTEST_VARDIR/log/master-bin.000002
|
|
--disable_query_log
|
|
select "--- stop-position --" as "";
|
|
--enable_query_log
|
|
--exec $MYSQL_BINLOG --short-form --stop-position=134 $MYSQLTEST_VARDIR/log/master-bin.000001 $MYSQLTEST_VARDIR/log/master-bin.000002
|
|
--disable_query_log
|
|
select "--- start-datetime --" as "";
|
|
--enable_query_log
|
|
--exec $MYSQL_BINLOG --short-form "--start-datetime=2020-01-21 15:32:24" $MYSQLTEST_VARDIR/log/master-bin.000001 $MYSQLTEST_VARDIR/log/master-bin.000002
|
|
--disable_query_log
|
|
select "--- stop-datetime --" as "";
|
|
--enable_query_log
|
|
--exec $MYSQL_BINLOG --short-form "--stop-datetime=2020-01-21 15:32:24" $MYSQLTEST_VARDIR/log/master-bin.000001 $MYSQLTEST_VARDIR/log/master-bin.000002
|
|
|
|
--disable_query_log
|
|
select "--- Remote --" as "";
|
|
--enable_query_log
|
|
|
|
--exec $MYSQL_BINLOG --short-form --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001
|
|
|
|
--disable_query_log
|
|
select "--- offset --" as "";
|
|
--enable_query_log
|
|
--exec $MYSQL_BINLOG --short-form --offset=2 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001
|
|
--disable_query_log
|
|
select "--- start-position --" as "";
|
|
--enable_query_log
|
|
--exec $MYSQL_BINLOG --short-form --start-position=608 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001
|
|
--disable_query_log
|
|
select "--- stop-position --" as "";
|
|
--enable_query_log
|
|
--exec $MYSQL_BINLOG --short-form --stop-position=608 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001
|
|
--disable_query_log
|
|
select "--- start and stop positions ---" as "";
|
|
--enable_query_log
|
|
--exec $MYSQL_BINLOG --short-form --start-position=608 --stop-position 725 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001
|
|
--disable_query_log
|
|
select "--- start-datetime --" as "";
|
|
--enable_query_log
|
|
--exec $MYSQL_BINLOG --short-form "--start-datetime=2020-01-21 15:32:24" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001
|
|
--disable_query_log
|
|
select "--- stop-datetime --" as "";
|
|
--enable_query_log
|
|
--exec $MYSQL_BINLOG --short-form "--stop-datetime=2020-01-21 15:32:24" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001
|
|
|
|
--disable_query_log
|
|
select "--- Remote with 2 binlogs on command line --" as "";
|
|
--enable_query_log
|
|
|
|
--exec $MYSQL_BINLOG --short-form --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002
|
|
|
|
--disable_query_log
|
|
select "--- offset --" as "";
|
|
--enable_query_log
|
|
--exec $MYSQL_BINLOG --short-form --offset=2 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002
|
|
--disable_query_log
|
|
select "--- start-position --" as "";
|
|
--enable_query_log
|
|
--exec $MYSQL_BINLOG --short-form --start-position=608 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002
|
|
--disable_query_log
|
|
select "--- stop-position --" as "";
|
|
--enable_query_log
|
|
--exec $MYSQL_BINLOG --short-form --stop-position=134 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002
|
|
--disable_query_log
|
|
select "--- start-datetime --" as "";
|
|
--enable_query_log
|
|
--exec $MYSQL_BINLOG --short-form "--start-datetime=20200121153224" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002
|
|
--disable_query_log
|
|
select "--- stop-datetime --" as "";
|
|
--enable_query_log
|
|
--exec $MYSQL_BINLOG --short-form "--stop-datetime=2020/01/21 15@32@24" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002
|
|
|
|
--disable_query_log
|
|
select "--- to-last-log --" as "";
|
|
--enable_query_log
|
|
|
|
--exec $MYSQL_BINLOG --short-form --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT --to-last-log master-bin.000001
|
|
|
|
# clean up
|
|
--disable_query_log
|
|
select "--- end of test --" as "";
|
|
--enable_query_log
|
|
drop table t1;
|
|
|
|
# End of 4.1 tests
|