mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 21:12:26 +01:00
88bd301d36
include/my_pthread.h: cleanup. don't use gcc extensions innobase/include/trx0sys.ic: Jan's fix for innobase_xa_prepare innobase/read/read0read.c: Jan's fix for innobase_xa_prepare innobase/trx/trx0trx.c: Jan's fix for innobase_xa_prepare mysql-test/include/varchar.inc: test fix mysql-test/r/ctype_ucs.result: new log event - all binlog positions are changed :( mysql-test/r/drop_temp_table.result: new log event - all binlog positions are changed :( mysql-test/r/insert_select.result: new log event - all binlog positions are changed :( mysql-test/r/mix_innodb_myisam_binlog.result: new log event - all binlog positions are changed :( mysql-test/r/myisam.result: test fix mysql-test/r/rpl000015.result: new log event - all binlog positions are changed :( mysql-test/r/rpl_change_master.result: new log event - all binlog positions are changed :( mysql-test/r/rpl_charset.result: new log event - all binlog positions are changed :( mysql-test/r/rpl_error_ignored_table.result: new log event - all binlog positions are changed :( mysql-test/r/rpl_flush_log_loop.result: new log event - all binlog positions are changed :( mysql-test/r/rpl_flush_tables.result: new log event - all binlog positions are changed :( mysql-test/r/rpl_loaddata.result: new log event - all binlog positions are changed :( mysql-test/r/rpl_loaddata_rule_m.result: new log event - all binlog positions are changed :( mysql-test/r/rpl_loaddata_rule_s.result: new log event - all binlog positions are changed :( mysql-test/r/rpl_log.result: new log event - all binlog positions are changed :( mysql-test/r/rpl_log_pos.result: new log event - all binlog positions are changed :( mysql-test/r/rpl_max_relay_size.result: new log event - all binlog positions are changed :( mysql-test/r/rpl_relayrotate.result: new log event - all binlog positions are changed :( mysql-test/r/rpl_replicate_do.result: new log event - all binlog positions are changed :( mysql-test/r/rpl_reset_slave.result: new log event - all binlog positions are changed :( mysql-test/r/rpl_rotate_logs.result: new log event - all binlog positions are changed :( mysql-test/r/rpl_server_id1.result: new log event - all binlog positions are changed :( mysql-test/r/rpl_server_id2.result: new log event - all binlog positions are changed :( mysql-test/r/rpl_temporary.result: new log event - all binlog positions are changed :( mysql-test/r/rpl_timezone.result: new log event - all binlog positions are changed :( mysql-test/r/rpl_until.result: new log event - all binlog positions are changed :( mysql-test/r/rpl_user_variables.result: new log event - all binlog positions are changed :( mysql-test/r/user_var.result: new log event - all binlog positions are changed :( mysql-test/t/ctype_ucs.test: new log event - all binlog positions are changed :( mysql-test/t/mix_innodb_myisam_binlog.test: new log event - all binlog positions are changed :( mysql-test/t/mysqlbinlog.test: new log event - all binlog positions are changed :( mysql-test/t/mysqlbinlog2.test: new log event - all binlog positions are changed :( mysql-test/t/rpl_charset.test: new log event - all binlog positions are changed :( mysql-test/t/rpl_error_ignored_table.test: new log event - all binlog positions are changed :( mysql-test/t/rpl_loaddata_rule_m.test: new log event - all binlog positions are changed :( mysql-test/t/rpl_loaddata_rule_s.test: new log event - all binlog positions are changed :( mysql-test/t/rpl_log.test: new log event - all binlog positions are changed :( mysql-test/t/rpl_log_pos.test: new log event - all binlog positions are changed :( mysql-test/t/rpl_user_variables.test: new log event - all binlog positions are changed :( mysql-test/t/user_var.test: new log event - all binlog positions are changed :( mysys/hash.c: typo fixed sql/ha_berkeley.cc: handlerton framework sql/ha_berkeley.h: handlerton framework sql/ha_innodb.cc: handlerton framework sql/ha_innodb.h: handlerton framework sql/handler.cc: new transaction handling, handlerton framework, two-phase commit, XA support sql/handler.h: new transaction handling, handlerton framework, two-phase commit, XA support sql/lex.h: XA commands sql/log.cc: new transaction handling, handlerton framework, two-phase commit, XA support, tc-logging, TC_LOG_MMAP class sql/log_event.cc: Xid_log_event sql/log_event.h: Xid_log_event, LOG_EVENT_BINLOG_CLOSED_F flag sql/mysql_priv.h: wrapper for query_id++ sql/mysqld.cc: new command-line options --log-tc, --log-tc-size, --tc-heuristic-recover, new status variables Tc_log_page_size, Tc_log_max_pages_used, Tc_log_page_waits. init/stop tc logging sql/set_var.h: warning fixed sql/share/errmsg.txt: XA error messages sql/sp_head.cc: s/query_id++/next_query_id()/ sql/sql_base.cc: typo fixed. new transaction handling. sql/sql_class.cc: cleanup of THD.transaction sql/sql_class.h: TC_LOG classes, new status variables, new savepoint handling, XA support sql/sql_insert.cc: comments sql/sql_lex.cc: s/found_colon/found_semicolon/ sql/sql_lex.h: SQLCOM_XA_xxx, XA related changes in Lex sql/sql_parse.cc: cleanup, XA commands, new savepoint handling sql/sql_repl.cc: two functions moved to log.cc sql/sql_repl.h: two functions moved to log.cc sql/sql_trigger.cc: s/lex.name_and_length/lex.ident/ sql/sql_yacc.yy: XA commands, cleanup
110 lines
4.3 KiB
Text
110 lines
4.3 KiB
Text
source include/master-slave.inc;
|
|
|
|
# Clean up old slave's binlogs.
|
|
# The slave is started with --log-slave-updates
|
|
# and this test does SHOW BINLOG EVENTS on the slave's
|
|
# binlog. But previous tests can influence the current test's
|
|
# binlog (e.g. a temporary table in the previous test has not
|
|
# been explicitly deleted, and at the beginning of the current
|
|
# test the slave immediately writes DROP TEMPORARY TABLE this_old_table).
|
|
# We wait for the slave to have written all he wants to the binlog
|
|
# (otherwise RESET MASTER may come too early).
|
|
save_master_pos;
|
|
connection slave;
|
|
sync_with_master;
|
|
stop slave;
|
|
reset master;
|
|
reset slave;
|
|
# We are going to read the slave's binlog which contains file_id (for some LOAD
|
|
# DATA INFILE); to make it repeatable (not influenced by other tests), we need
|
|
# to stop and start the slave, to be sure file_id will start from 1.
|
|
# This can be done with 'server_stop slave', but
|
|
# this would require the manager, so most of the time the test will be skipped
|
|
# :(
|
|
# To workaround this, I (Guilhem) add a (empty) rpl_log-slave.opt (because when
|
|
# mysql-test-run finds such a file it restarts the slave before doing the
|
|
# test). That's not very elegant but I could find no better way, sorry.
|
|
|
|
let $VERSION=`select version()`;
|
|
|
|
connection master;
|
|
reset master;
|
|
create table t1(n int not null auto_increment primary key);
|
|
insert into t1 values (NULL);
|
|
drop table t1;
|
|
create table t1 (word char(20) not null);
|
|
load data infile '../../std_data/words.dat' into table t1 ignore 1 lines;
|
|
select count(*) from t1;
|
|
drop table t1;
|
|
--replace_result $VERSION VERSION
|
|
show binlog events;
|
|
show binlog events from 96 limit 1;
|
|
show binlog events from 96 limit 2;
|
|
show binlog events from 96 limit 2,1;
|
|
flush logs;
|
|
|
|
# We need an extra update before doing save_master_pos.
|
|
# Otherwise, an unlikely scenario may occur:
|
|
# * When the master's binlog_dump thread reads the end of master-bin.001,
|
|
# it send the rotate event which is at this end, plus a fake rotate event
|
|
# because it's starting to read a new binlog.
|
|
# save_master_pos will record the position of the first of the two rotate
|
|
# (because the fake one is not in the master's binlog anyway).
|
|
# * Later the slave waits for the position of the first rotate event,
|
|
# and it may quickly stop (in 'slave stop') without having received the fake
|
|
# one.
|
|
# So, depending on a few milliseconds, we end up with 2 rotate events in the
|
|
# relay log or one, which influences the output of SHOW SLAVE STATUS, making
|
|
# it not predictable and causing random test failures.
|
|
# To make it predictable, we do a useless update now, but which has the
|
|
# interest of making the slave catch both rotate events.
|
|
|
|
create table t5 (a int);
|
|
drop table t5;
|
|
|
|
# Sync slave and force it to start on another binary log
|
|
|
|
save_master_pos;
|
|
connection slave;
|
|
# Note that the above 'slave start' will cause a 3rd rotate event (a fake one)
|
|
# to go into the relay log (the master always sends a fake one when replication
|
|
# starts).
|
|
start slave;
|
|
sync_with_master;
|
|
flush logs;
|
|
stop slave;
|
|
connection master;
|
|
|
|
# Create some entries for second log
|
|
|
|
create table t1 (n int);
|
|
insert into t1 values (1);
|
|
drop table t1;
|
|
--replace_result $VERSION VERSION
|
|
show binlog events;
|
|
--replace_result $VERSION VERSION
|
|
show binlog events in 'master-bin.000002';
|
|
show binary logs;
|
|
save_master_pos;
|
|
connection slave;
|
|
start slave;
|
|
sync_with_master;
|
|
show binary logs;
|
|
--replace_result $MASTER_MYPORT MASTER_PORT $VERSION VERSION
|
|
show binlog events in 'slave-bin.000001' from 4;
|
|
--replace_result $MASTER_MYPORT MASTER_PORT $VERSION VERSION
|
|
show binlog events in 'slave-bin.000002' from 4;
|
|
--replace_result $MASTER_MYPORT MASTER_PORT
|
|
--replace_column 1 # 8 # 9 # 23 # 33 #
|
|
show slave status;
|
|
|
|
# Need to recode the following
|
|
|
|
#show new master for slave with master_log_file='master-bin.000001' and master_log_pos=4 and master_server_id=1;
|
|
#show new master for slave with master_log_file='master-bin.000001' and master_log_pos=79 and master_server_id=1;
|
|
#show new master for slave with master_log_file='master-bin.000001' and master_log_pos=311 and master_server_id=1;
|
|
#show new master for slave with master_log_file='master-bin.000002' and master_log_pos=4 and master_server_id=1;
|
|
#show new master for slave with master_log_file='master-bin.000002' and master_log_pos=122 and master_server_id=1;
|
|
|
|
--error 1220
|
|
show binlog events in 'slave-bin.000005' from 4;
|