mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 13:02:28 +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)
111 lines
3.5 KiB
Text
111 lines
3.5 KiB
Text
#############################################################################
|
|
# Original Author: JBM #
|
|
# Original Date: Aug/18/2005 #
|
|
# Updated: 08/29/2005 turned on diff and commented out debug SQL statements#
|
|
#############################################################################
|
|
#TEST: SP to test alter table and nested SP calls #
|
|
#############################################################################
|
|
|
|
# Includes
|
|
-- source include/have_binlog_format_row.inc
|
|
-- source include/master-slave.inc
|
|
|
|
|
|
# Begin clean up test section
|
|
connection master;
|
|
--disable_warnings
|
|
DROP PROCEDURE IF EXISTS test.p1;
|
|
DROP PROCEDURE IF EXISTS test.p2;
|
|
DROP PROCEDURE IF EXISTS test.p3;
|
|
DROP PROCEDURE IF EXISTS test.p4;
|
|
DROP PROCEDURE IF EXISTS test.p5;
|
|
DROP PROCEDURE IF EXISTS test.p6;
|
|
DROP PROCEDURE IF EXISTS test.p7;
|
|
DROP TABLE IF EXISTS test.t1;
|
|
DROP TABLE IF EXISTS test.t2;
|
|
|
|
|
|
# Begin test section 1
|
|
CREATE TABLE test.t1 (a int, PRIMARY KEY(a));
|
|
INSERT INTO test.t1 VALUES (1);
|
|
|
|
delimiter |;
|
|
CREATE PROCEDURE test.p1()
|
|
BEGIN
|
|
ALTER TABLE test.t1 ADD COLUMN b CHAR(4) AFTER a;
|
|
UPDATE test.t1 SET b = 'rbr' WHERE a = 1;
|
|
CALL test.p2();
|
|
END|
|
|
CREATE PROCEDURE test.p2()
|
|
BEGIN
|
|
ALTER TABLE test.t1 ADD COLUMN f FLOAT AFTER b;
|
|
UPDATE test.t1 SET f = RAND() WHERE a = 1;
|
|
CALL test.p3();
|
|
END|
|
|
CREATE PROCEDURE test.p3()
|
|
BEGIN
|
|
ALTER TABLE test.t1 RENAME test.t2;
|
|
CALL test.p4();
|
|
END|
|
|
CREATE PROCEDURE test.p4()
|
|
BEGIN
|
|
ALTER TABLE test.t2 ADD INDEX (f);
|
|
ALTER TABLE test.t2 CHANGE a a INT UNSIGNED NOT NULL AUTO_INCREMENT;
|
|
INSERT INTO test.t2 VALUES (NULL,'TEST',RAND());
|
|
CALL test.p5();
|
|
END|
|
|
CREATE PROCEDURE test.p5()
|
|
BEGIN
|
|
ALTER TABLE test.t2 ORDER BY f;
|
|
INSERT INTO test.t2 VALUES (NULL,'STM',RAND());
|
|
CALL test.p6();
|
|
END|
|
|
CREATE PROCEDURE test.p6()
|
|
BEGIN
|
|
ALTER TABLE test.t2 ADD COLUMN b2 CHAR(4) FIRST;
|
|
ALTER TABLE test.t2 ADD COLUMN to_drop BIT(8) AFTER b2;
|
|
INSERT INTO test.t2 VALUES ('new',1,NULL,'STM',RAND());
|
|
CALL test.p7();
|
|
END|
|
|
CREATE PROCEDURE test.p7()
|
|
BEGIN
|
|
ALTER TABLE test.t2 DROP COLUMN to_drop;
|
|
INSERT INTO test.t2 VALUES ('gone',NULL,'STM',RAND());
|
|
END|
|
|
delimiter ;|
|
|
CALL test.p1();
|
|
|
|
#SELECT * FROM test.t2;
|
|
sync_slave_with_master;
|
|
#SELECT * FROM test.t2;
|
|
|
|
--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/sp011_master.sql
|
|
--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/sp011_slave.sql
|
|
|
|
# Cleanup
|
|
connection master;
|
|
#show binlog events;
|
|
DROP PROCEDURE IF EXISTS test.p1;
|
|
DROP PROCEDURE IF EXISTS test.p2;
|
|
DROP PROCEDURE IF EXISTS test.p3;
|
|
DROP PROCEDURE IF EXISTS test.p4;
|
|
DROP PROCEDURE IF EXISTS test.p5;
|
|
DROP PROCEDURE IF EXISTS test.p6;
|
|
DROP PROCEDURE IF EXISTS test.p7;
|
|
DROP TABLE IF EXISTS test.t1;
|
|
DROP TABLE IF EXISTS test.t2;
|
|
sync_slave_with_master;
|
|
|
|
# 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 :-) Failed test
|
|
# Will leave dump files in $MYSQLTEST_VARDIR/tmp
|
|
|
|
diff_files $MYSQLTEST_VARDIR/tmp/sp011_master.sql $MYSQLTEST_VARDIR/tmp/sp011_slave.sql;
|
|
|
|
# If all is good, when can cleanup our dump files.
|
|
--remove_file $MYSQLTEST_VARDIR/tmp/sp011_master.sql
|
|
--remove_file $MYSQLTEST_VARDIR/tmp/sp011_slave.sql
|
|
|
|
# End of 5.0 test case
|