mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 05:52:27 +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)
74 lines
2.5 KiB
Text
74 lines
2.5 KiB
Text
#############################################################################
|
|
# Original Author: JBM #
|
|
# Original Date: Aug/18/2005 #
|
|
# Updated 08/30/2005 Added dumps and diff #
|
|
#############################################################################
|
|
#TEST: Taken and modfied from http://bugs.mysql.com/bug.php?id=12480 #
|
|
#############################################################################
|
|
|
|
# Includes
|
|
-- source include/have_binlog_format_row.inc
|
|
-- source include/master-slave.inc
|
|
|
|
|
|
# Begin clean up test section
|
|
connection master;
|
|
--disable_warnings
|
|
create database if not exists mysqltest1;
|
|
DROP TABLE IF EXISTS mysqltest1.t1;
|
|
--enable_warnings
|
|
|
|
|
|
# Begin test section 1
|
|
CREATE TABLE mysqltest1.t1 (n MEDIUMINT NOT NULL AUTO_INCREMENT,
|
|
a TIMESTAMP DEFAULT '2005-05-05 01:01:01',
|
|
b TIMESTAMP DEFAULT '2005-05-05 01:01:01',
|
|
PRIMARY KEY(n));
|
|
delimiter |;
|
|
CREATE FUNCTION mysqltest1.f1() RETURNS TIMESTAMP
|
|
BEGIN
|
|
DECLARE v1 INT DEFAULT 300;
|
|
WHILE v1 > 0 DO
|
|
SET v1 = v1 - 1;
|
|
END WHILE;
|
|
RETURN NOW();
|
|
END|
|
|
delimiter ;|
|
|
|
|
INSERT INTO mysqltest1.t1 VALUES(NULL,NOW(),mysqltest1.f1());
|
|
|
|
delimiter |;
|
|
CREATE TRIGGER mysqltest1.trig1 BEFORE INSERT ON mysqltest1.t1
|
|
FOR EACH ROW BEGIN
|
|
SET new.b = mysqltest1.f1();
|
|
END|
|
|
delimiter ;|
|
|
|
|
INSERT INTO mysqltest1.t1 SET n = NULL, a = now();
|
|
|
|
sync_slave_with_master;
|
|
|
|
connection master;
|
|
|
|
--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info mysqltest1 > $MYSQLTEST_VARDIR/tmp/NOW_master.sql
|
|
--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info mysqltest1 > $MYSQLTEST_VARDIR/tmp/NOW_slave.sql
|
|
|
|
# lets cleanup
|
|
DROP TABLE IF EXISTS mysqltest1.t1;
|
|
DROP FUNCTION mysqltest1.f1;
|
|
DROP DATABASE mysqltest1;
|
|
|
|
# Lets 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 :-) The failed dump
|
|
# files will be located in $MYSQLTEST_VARDIR/tmp
|
|
|
|
diff_files $MYSQLTEST_VARDIR/tmp/NOW_master.sql $MYSQLTEST_VARDIR/tmp/NOW_slave.sql;
|
|
|
|
# If all is good, when can cleanup our dump files.
|
|
--remove_file $MYSQLTEST_VARDIR/tmp/NOW_master.sql
|
|
--remove_file $MYSQLTEST_VARDIR/tmp/NOW_slave.sql
|
|
|
|
sync_slave_with_master;
|
|
# End of 5.1 test case
|