mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 05:52:27 +01:00
5db7ee3ee9
Problem: mysqlbinlog does not free memory if an error happens.
Fix: binlog-processing functions do not call exit() anymore. Instead, they
print an error and return an error code. Error codes are propagated all
the way back to main, and all allocated memory is freed on the way.
client/mysqlbinlog.cc:
- New error handling policy: functions processing binlogs don't just
exit() anymore. Instead, they print a message and return an error
status.
- New policy for the global `mysql' and `glob_description_event': these
are not passed as parameters anymore. The global pointer is used
instead.
- More error situations are detected and reported.
- Better error messages: the program never terminates with exit status 1
without explanation any more. Fixed spelling errors. Use consistent
format of messages (a single line beginning with "ERROR: " or
"WARNING: " and ending with "." is printed to stderr.)
- New memory handling: memory is always freed on program termination.
- Better comments: more functions are explained, doxygen is used, and
more precise formulations in some existing comments.
mysql-test/suite/binlog/r/binlog_base64_flag.result:
Result file updated since output format of mysqlbinlog changed while the
test was disabled.
mysql-test/suite/binlog/t/binlog_killed.test:
Mysqlbinlog now works as described when the binlog is open. Hence, the
--force-if-open flag must be passed
mysql-test/suite/binlog/t/binlog_killed_simulate.test:
Mysqlbinlog now works as described when the binlog is open. Hence, the
--force-if-open flag must be passed
mysql-test/suite/binlog/t/disabled.def:
Now that mysqlbinlog cleans up after itself on abnormal termination, we
can enable this test again.
69 lines
2.3 KiB
Text
69 lines
2.3 KiB
Text
-- source include/have_debug.inc
|
|
-- source include/have_binlog_format_mixed_or_statement.inc
|
|
#
|
|
# bug#27571 asynchronous setting mysql_$query()'s local error and
|
|
# Query_log_event::error_code
|
|
#
|
|
|
|
--disable_warnings
|
|
drop table if exists t1,t2;
|
|
--enable_warnings
|
|
|
|
#
|
|
# Checking that killing upon successful row-loop does not affect binlogging
|
|
#
|
|
|
|
create table t1 (a int) engine=MyISAM;
|
|
insert into t1 set a=1;
|
|
reset master;
|
|
|
|
update t1 set a=2 /* will be "killed" after work has been done */;
|
|
|
|
# a proof the query is binlogged with no error
|
|
#todo: introduce a suite private macro that provides numeric values
|
|
# for some constants like the offset of the first real event
|
|
# that is different between severs versions.
|
|
--exec $MYSQL_BINLOG --force-if-open --start-position=106 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
|
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
|
eval select
|
|
(@a:=load_file("$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
|
|
is not null;
|
|
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
|
|
let $error_code= `select @a like "%#%error_code=0%" /* must return 1 */`;
|
|
eval select $error_code /* must return 1 as query completed before got killed*/;
|
|
|
|
# cleanup for the sub-case
|
|
system rm $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog;
|
|
|
|
|
|
#
|
|
# Checking that killing inside of row-loop for LOAD DATA into
|
|
# non-transactional table affects binlogging
|
|
#
|
|
|
|
create table t2 (a int, b int) ENGINE=MyISAM;
|
|
reset master;
|
|
--error ER_QUERY_INTERRUPTED
|
|
load data infile '../std_data_ln/rpl_loaddata.dat' into table t2 /* will be "killed" in the middle */;
|
|
|
|
|
|
# a proof the query is binlogged with an error
|
|
|
|
source include/show_binlog_events.inc;
|
|
|
|
--exec $MYSQL_BINLOG --force-if-open --start-position=98 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
|
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
|
eval select
|
|
(@a:=load_file("$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
|
|
is not null;
|
|
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
|
|
let $error_code= `select @a like "%#%error_code=0%" /* must return 0*/`;
|
|
eval select $error_code /* must return 0 to mean the killed query is in */;
|
|
|
|
# cleanup for the sub-case
|
|
system rm $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog;
|
|
|
|
|
|
drop table t1,t2;
|
|
|
|
--echo end of the tests
|