mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 15:24:16 +01:00
48892844a9
Change to use remove_file instead of 'system rm' in a lot of tests. (Should fix some windows test problems) Removed memory leak in mysql_test if sync_with_master fails. Do not terminate ndb_cluster_binary_log before the util thread has finnished. This should fix a shutdown bug where a thread is accessing injector_mutex after it's freed. Patch may fix Bug#27622 "mysqld shutdown, util thread continues, while binlog thread exits" client/mysqltest.c: Added missing 'mysql_free_result' (fixed confusing memory leak when sync_with_master fails)ug mysql-test/mysql-test-run.pl: Add the test case name to the instance manager log files mysql-test/r/rpl_log_pos.result: Made test more portable (for powermac) mysql-test/t/disabled.def: Disabled im_life_cycle (added bug#27851) mysql-test/t/myisam-system.test: Use remove_file instead of "system rm" mysql-test/t/ndb_autodiscover.test: Use remove_file instead of "system rm" mysql-test/t/ndb_loaddatalocal.test: Use remove_file instead of "system rm" mysql-test/t/rpl_loaddatalocal.test: Use remove_file instead of "system rm" mysql-test/t/rpl_log_pos.test: Made test more portable (for powermac) mysql-test/t/rpl_misc_functions.test: Use remove_file instead of "system rm" mysql-test/t/rpl_rbr_to_sbr.test: Use remove_file instead of "system rm" mysql-test/t/rpl_row_NOW.test: Use remove_file instead of "system rm" mysql-test/t/rpl_row_sp001.test: Use remove_file instead of "system rm" mysql-test/t/rpl_row_sp011.test: Use remove_file instead of "system rm" mysql-test/t/show_check.test: Use remove_file instead of "system rm" mysys/my_alloc.c: Don't return on zero argument, as this may hide other errors server-tools/instance-manager/log.cc: Log errors to both stdout and stderr (to know in which context we got the error) server-tools/instance-manager/thread_registry.cc: Log error before common assert (to know in which context we fail) sql/ha_ndbcluster.cc: Do not terminate ndb_cluster_binary_log before the util thread has finnished. sql/ha_ndbcluster.h: Do not terminate ndb_cluster_binary_log before the util thread has finnished. sql/ha_ndbcluster_binlog.cc: Do not terminate ndb_cluster_binary_log before the util thread has finnished. sql-common/client.c: Clear field_alloc when it's moved to result set (allows us to always call free_root on field_alloc)
47 lines
1.8 KiB
Text
47 lines
1.8 KiB
Text
-- source include/have_binlog_format_mixed_or_statement.inc
|
|
-- source include/not_ndb_default.inc
|
|
-- source include/master-slave.inc
|
|
|
|
# Test that the slave temporarily switches to ROW when seeing binrow
|
|
# events when it is in STATEMENT or MIXED mode
|
|
|
|
SET BINLOG_FORMAT=MIXED;
|
|
SET GLOBAL BINLOG_FORMAT=MIXED;
|
|
SELECT @@GLOBAL.BINLOG_FORMAT, @@SESSION.BINLOG_FORMAT;
|
|
|
|
--echo **** On Master ****
|
|
CREATE TABLE t1 (a INT, b LONG);
|
|
INSERT INTO t1 VALUES (1,1), (2,2);
|
|
INSERT INTO t1 VALUES (3,UUID()), (4,UUID());
|
|
let $VERSION=`select version()`;
|
|
--replace_result $VERSION VERSION
|
|
--replace_column 2 # 5 #
|
|
--replace_regex /table_id: [0-9]+/table_id: #/
|
|
SHOW BINLOG EVENTS;
|
|
sync_slave_with_master;
|
|
--echo **** On Slave ****
|
|
--replace_result $MASTER_MYPORT MASTER_PORT
|
|
--replace_column 1 # 8 # 9 # 23 # 33 #
|
|
--query_vertical SHOW SLAVE STATUS
|
|
--replace_result $VERSION VERSION
|
|
--replace_column 2 # 5 #
|
|
--replace_regex /table_id: [0-9]+/table_id: #/
|
|
SHOW BINLOG EVENTS;
|
|
|
|
--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/rpl_rbr_to_sbr_master.sql
|
|
--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/rpl_rbr_to_sbr_slave.sql
|
|
|
|
connection master;
|
|
DROP TABLE IF EXISTS t1;
|
|
|
|
# Let's compare. Note: If they match test will pass, if they do not match
|
|
# the test will show that the diff statement failed and not reject file
|
|
# will be created. You will need to go to the mysql-test dir and diff
|
|
# the files your self to see what is not matching
|
|
|
|
diff_files $MYSQLTEST_VARDIR/tmp/rpl_rbr_to_sbr_master.sql $MYSQLTEST_VARDIR/tmp/rpl_rbr_to_sbr_slave.sql;
|
|
|
|
# If all is good, we can remove the files
|
|
|
|
--remove_file $MYSQLTEST_VARDIR/tmp/rpl_rbr_to_sbr_master.sql
|
|
--remove_file $MYSQLTEST_VARDIR/tmp/rpl_rbr_to_sbr_slave.sql
|