mirror of
https://github.com/MariaDB/server.git
synced 2025-01-21 06:22:28 +01:00
8d37a30eac
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).
client/client_priv.h:
Declared the new option for base64 output.
client/mysqlbinlog.cc:
- Change from using the two-state command line option
"default/--base64-output" to the three-state
"--base64-output=[never|auto|always]"
- Print the FD event even if it is outside the --start-position range.
- Stop if a row event is about to be printed without a preceding FD
event.
- Minor fixes:
* changed 4 to EVENT_TYPE_OFFSET in some places
* Added comments
* before, "mysqlbinlog -xyz" read from stdin; now it does not
(only "mysqlbinlog -" reads stdin).
mysql-test/r/mysqlbinlog2.result:
Updated result file: mysqlbinlog now prints ROLLBACK always.
mysql-test/suite/binlog/t/disabled.def:
The test must be disabled since it reveals another bug: see BUG#33247.
mysql-test/suite/rpl/r/rpl_bug31076.result:
Updated result file
mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result:
Updated result file
mysql-test/suite/rpl/t/rpl_bug31076.test:
Had to add explicit Format_description_log_event before other BINLOG
statements
mysql-test/t/mysqlbinlog2.test:
we must suppress base64 output in result file because it contains a
timestamp
sql/log_event.cc:
- Made FD events able to print themselves
- Added check that the current FD event knows about the event type, when
an event is about to be read. (Hint to reviewers: I had to re-indent
a big block because of this; use diff -b)
* To get a decent error message, I also added a class method
const char* Log_event::get_type_str(Log_event_type)
which converts number to event type string without having a
Log_event object.
* Made Log_event::get_type_str aware of PRE_GA_*_ROWS_LOG_EVENT.
- Minor fixes:
* Changed return to DBUG_VOID_RETURN
sql/log_event.h:
- Declared enum to describe the three base64_output modes
- Use the enum instead of a flag
- Declare the new class method get_type_str (see log_event.cc)
sql/share/errmsg.txt:
Added error msg.
sql/slave.cc:
- Factored out part of exec_relay_log_event to the new function
apply_event_and_update_pos, because that code is needed when executing
BINLOG statements. (this is be functionally equivalent to the
previous code, except: (1) skipping events is now optional, controlled
by a parameter to the new function (2) the return value of
exec_relay_log_event has changed; see next item).
- Changed returned error value to always be 1. Before, it would return
the error value from apply_log_event, which was unnecessary. This
change is safe because the exact return value of exec_relay_log_event
is never examined; it is only tested to be ==0 or !=0.
- Added comments describing exec_relay_log_event and
apply_event_and_update_pos.
- Minor fixes:
* Removed duplicate declaration of next_event, made queue_event
static.
* Added doxygen code to include this file.
sql/slave.h:
Declared the new apply_event_and_update_pos
sql/sql_binlog.cc:
- Made mysql_binlog_statement set the current FD event when the given
event is an FD event. This entails using the new function
apply_event_and_update_pos from slave.cc instead of just calling the
ev->apply method.
- Made mysql_binlog_statement fail if the first BINLOG statement is not
an FD event.
mysql-test/suite/binlog/r/binlog_base64_flag.result:
New test file needs new result file
mysql-test/suite/binlog/t/binlog_base64_flag.test:
Added test case to verify that:
- my patch fixes the bug
- the new --base64-output flag works as expected
- base64 events not preceded by an FD event give an error
- an event of a type not known by the current FD event fails cleanly.
mysql-test/suite/binlog/std_data/binlog-bug32407.000001:
BitKeeper file /home/sven/bk/b32407-5.1-new-rpl-mysqlbinlog_base64/mysql-test/suite/binlog/std_data/binlog-bug32407.000001
|
||
|---|---|---|
| .. | ||
| rpl000001.a.result | ||
| rpl000001.b.result | ||
| rpl000010.result | ||
| rpl000011.result | ||
| rpl000013.result | ||
| rpl000017.result | ||
| rpl_000015.result | ||
| rpl_alter.result | ||
| rpl_alter_db.result | ||
| rpl_auto_increment.result | ||
| rpl_auto_increment_11932.result | ||
| rpl_binlog_grant.result | ||
| rpl_bit.result | ||
| rpl_bit_npk.result | ||
| rpl_bug31076.result | ||
| rpl_change_master.result | ||
| rpl_charset_sjis.result | ||
| rpl_colSize.result | ||
| rpl_commit_after_flush.result | ||
| rpl_create_database.result | ||
| rpl_critical_errors.result | ||
| rpl_critical_errors.result.txt | ||
| rpl_ddl.result | ||
| rpl_deadlock_innodb.result | ||
| rpl_delete_no_where.result | ||
| rpl_do_grant.result | ||
| rpl_drop.result | ||
| rpl_drop_db.result | ||
| rpl_drop_temp.result | ||
| rpl_drop_view.result | ||
| rpl_dual_pos_advance.result | ||
| rpl_EE_err.result | ||
| rpl_empty_master_crash.result | ||
| rpl_err_ignoredtable.result | ||
| rpl_events.result | ||
| rpl_extraCol_innodb.result | ||
| rpl_extraCol_myisam.result | ||
| rpl_extraColmaster_innodb.result | ||
| rpl_extraColmaster_myisam.result | ||
| rpl_failed_optimize.result | ||
| rpl_flushlog_loop.result | ||
| rpl_foreign_key_innodb.result | ||
| rpl_found_rows.result | ||
| rpl_free_items.result | ||
| rpl_get_lock.result | ||
| rpl_grant.result | ||
| rpl_idempotency.result | ||
| rpl_ignore_grant.result | ||
| rpl_ignore_revoke.result | ||
| rpl_ignore_table.result | ||
| rpl_ignore_table_update.result | ||
| rpl_incident.result | ||
| rpl_init_slave.result | ||
| rpl_innodb.result | ||
| rpl_innodb_bug28430.result | ||
| rpl_innodb_bug30888.result | ||
| rpl_innodb_bug30919.result | ||
| rpl_innodb_mixed_ddl.result | ||
| rpl_innodb_mixed_dml.result | ||
| rpl_insert.result | ||
| rpl_insert_id.result | ||
| rpl_insert_id_pk.result | ||
| rpl_insert_ignore.result | ||
| rpl_insert_select.result | ||
| rpl_invoked_features.result | ||
| rpl_known_bugs_detection.result | ||
| rpl_LD_INFILE.result | ||
| rpl_load_from_master.result | ||
| rpl_load_table_from_master.result | ||
| rpl_loaddata.result | ||
| rpl_loaddata_charset.result | ||
| rpl_loaddata_fatal.result | ||
| rpl_loaddata_m.result | ||
| rpl_loaddata_s.result | ||
| rpl_loaddata_simple.result | ||
| rpl_loaddatalocal.result | ||
| rpl_loadfile.result | ||
| rpl_locale.result | ||
| rpl_log_pos.result | ||
| rpl_many_optimize.result | ||
| rpl_master_pos_wait.result | ||
| rpl_misc_functions.result | ||
| rpl_mixed_ddl_dml.result | ||
| rpl_multi_delete.result | ||
| rpl_multi_delete2.result | ||
| rpl_multi_engine.result | ||
| rpl_multi_update.result | ||
| rpl_multi_update2.result | ||
| rpl_multi_update3.result | ||
| rpl_multi_update4.result | ||
| rpl_optimize.result | ||
| rpl_packet.result | ||
| rpl_ps.result | ||
| rpl_rbr_to_sbr.result | ||
| rpl_read_only.result | ||
| rpl_redirect.result | ||
| rpl_relay_space_innodb.result | ||
| rpl_relay_space_myisam.result | ||
| rpl_relayrotate.result | ||
| rpl_relayspace.result | ||
| rpl_replicate_do.result | ||
| rpl_replicate_ignore_db.result | ||
| rpl_rewrt_db.result | ||
| rpl_rotate_logs.result | ||
| rpl_row_001.result | ||
| rpl_row_4_bytes.result | ||
| rpl_row_basic_2myisam.result | ||
| rpl_row_basic_3innodb.result | ||
| rpl_row_basic_8partition.result | ||
| rpl_row_basic_11bugs-master.opt | ||
| rpl_row_basic_11bugs-slave.opt | ||
| rpl_row_basic_11bugs.result | ||
| rpl_row_blob_innodb.result | ||
| rpl_row_blob_myisam.result | ||
| rpl_row_charset.result | ||
| rpl_row_charset_innodb.result | ||
| rpl_row_colSize.result | ||
| rpl_row_create_table.result | ||
| rpl_row_delayed_ins.result | ||
| rpl_row_drop.result | ||
| rpl_row_err_ignoredtable.result | ||
| rpl_row_flsh_tbls.result | ||
| rpl_row_func001.result | ||
| rpl_row_func002.result | ||
| rpl_row_func003.result | ||
| rpl_row_inexist_tbl.result | ||
| rpl_row_insert_delayed.result | ||
| rpl_row_loaddata_m.result | ||
| rpl_row_log.result | ||
| rpl_row_log_innodb.result | ||
| rpl_row_max_relay_size.result | ||
| rpl_row_multi_query.result | ||
| rpl_row_mysqlbinlog.result | ||
| rpl_row_mystery22.result | ||
| rpl_row_NOW.result | ||
| rpl_row_reset_slave.result | ||
| rpl_row_sp001.result | ||
| rpl_row_sp002_innodb.result | ||
| rpl_row_sp003.result | ||
| rpl_row_sp005.result | ||
| rpl_row_sp006_InnoDB.result | ||
| rpl_row_sp007_innodb.result | ||
| rpl_row_sp008.result | ||
| rpl_row_sp009.result | ||
| rpl_row_sp010.result | ||
| rpl_row_sp011.result | ||
| rpl_row_sp012.result | ||
| rpl_row_stop_middle.result | ||
| rpl_row_stop_middle_update.result | ||
| rpl_row_tabledefs_2myisam.result | ||
| rpl_row_tabledefs_3innodb.result | ||
| rpl_row_tabledefs_7ndb.result | ||
| rpl_row_trig001.result | ||
| rpl_row_trig002.result | ||
| rpl_row_trig003.result | ||
| rpl_row_trig004.result | ||
| rpl_row_unsafe_funcs.result | ||
| rpl_row_until.result | ||
| rpl_row_USER.result | ||
| rpl_row_UUID.result | ||
| rpl_row_view01.result | ||
| rpl_server_id1.result | ||
| rpl_server_id2.result | ||
| rpl_session_var.result | ||
| rpl_set_charset.result | ||
| rpl_sf.result | ||
| rpl_skip_error.result | ||
| rpl_slave_skip.result | ||
| rpl_slave_status.result | ||
| rpl_sp.result | ||
| rpl_sp004.result | ||
| rpl_sp_effects.result | ||
| rpl_sporadic_master.result | ||
| rpl_ssl.result | ||
| rpl_ssl1.result | ||
| rpl_start_stop_slave.result | ||
| rpl_stm_000001.result | ||
| rpl_stm_charset.result | ||
| rpl_stm_EE_err2.result | ||
| rpl_stm_flsh_tbls.result | ||
| rpl_stm_insert_delayed.result | ||
| rpl_stm_log.result | ||
| rpl_stm_max_relay_size.result | ||
| rpl_stm_multi_query.result | ||
| rpl_stm_mystery22.result | ||
| rpl_stm_no_op.result | ||
| rpl_stm_reset_slave.result | ||
| rpl_stm_until.result | ||
| rpl_switch_stm_row_mixed.result | ||
| rpl_temp_table.result | ||
| rpl_temporary.result | ||
| rpl_temporary_errors.result | ||
| rpl_timezone.result | ||
| rpl_trigger.result | ||
| rpl_trunc_temp.result | ||
| rpl_truncate_2myisam.result | ||
| rpl_truncate_3innodb.result | ||
| rpl_truncate_7ndb_2.result | ||
| rpl_udf.result | ||
| rpl_user_variables.result | ||
| rpl_variables.result | ||
| rpl_view.result | ||