mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
a71fb6407f
Rename mix_innodb_myisam_binlog-master.opt; when the test was moved to separate stm/row test cases, the .opt were not moved along with it, causing a 60-second test duration because of default lock timeout :-( mysql-test/t/binlog_row_mix_innodb_myisam-master.opt: bk cp mysql-test/t/mix_innodb_myisam_binlog-master.opt mysql-test/t/binlog_row_mix_innodb_myisam-master.opt mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt: Rename: mysql-test/t/mix_innodb_myisam_binlog-master.opt -> mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt mysql-test/r/mysqlbinlog_base64.result: Fix test cases to work with non-standard --vardir. mysql-test/r/ndb_load.result: Fix test cases to work with non-standard --vardir. mysql-test/r/rpl_LD_INFILE.result: Fix test cases to work with non-standard --vardir. mysql-test/r/rpl_loaddata2.result: Fix test cases to work with non-standard --vardir. mysql-test/r/rpl_loaddata_m.result: Fix test cases to work with non-standard --vardir. mysql-test/t/loaddata.test: Fix test cases to work with non-standard --vardir. mysql-test/t/mysqlbinlog_base64.test: Fix test cases to work with non-standard --vardir. mysql-test/t/ndb_dd_dump.test: Fix test cases to work with non-standard --vardir. mysql-test/t/ndb_load.test: Fix test cases to work with non-standard --vardir. mysql-test/t/rpl_LD_INFILE.test: Fix test cases to work with non-standard --vardir. mysql-test/t/rpl_loaddata2.test: Fix test cases to work with non-standard --vardir. mysql-test/t/rpl_loaddata_m.test: Fix test cases to work with non-standard --vardir. mysql-test/t/rpl_loadfile.test: Fix test cases to work with non-standard --vardir. mysql-test/extra/rpl_tests/rpl_row_001.test: Fix test cases to work with non-standard --vardir. mysql-test/r/rpl_load_table_from_master.result: Fix test cases to work with non-standard --vardir. mysql-test/r/rpl_loadfile.result: Fix test cases to work with non-standard --vardir. mysql-test/r/rpl_ndb_row_001.result: Fix test cases to work with non-standard --vardir. mysql-test/r/rpl_row_001.result: Fix test cases to work with non-standard --vardir. mysql-test/r/rpl_row_loaddata_m.result: Fix test cases to work with non-standard --vardir. mysql-test/r/rpl_row_stop_middle_update.result: Fix test cases to work with non-standard --vardir. mysql-test/t/rpl_drop_db.test: Fix test cases to work with non-standard --vardir. mysql-test/t/rpl_load_table_from_master.test: Fix test cases to work with non-standard --vardir. mysql-test/t/rpl_row_stop_middle_update.test: Fix test cases to work with non-standard --vardir. mysql-test/extra/rpl_tests/rpl_row_UUID.test: Fix test cases to work with non-standard --vardir. mysql-test/extra/rpl_tests/rpl_row_blob.test: Fix test cases to work with non-standard --vardir. mysql-test/extra/rpl_tests/rpl_row_charset.test: Fix test cases to work with non-standard --vardir. mysql-test/extra/rpl_tests/rpl_row_func003.test: Fix test cases to work with non-standard --vardir. mysql-test/extra/rpl_tests/rpl_row_sp006.test: Fix test cases to work with non-standard --vardir. mysql-test/include/ndb_backup.inc: Fix test cases to work with non-standard --vardir. mysql-test/r/rpl_ndb_bank.result: Fix test cases to work with non-standard --vardir. mysql-test/r/rpl_ndb_sync.result: Fix test cases to work with non-standard --vardir. mysql-test/t/rpl_ndb_bank.test: Fix test cases to work with non-standard --vardir. mysql-test/t/rpl_ndb_sync.test: Fix test cases to work with non-standard --vardir. mysql-test/t/rpl_row_NOW.test: Fix test cases to work with non-standard --vardir. mysql-test/t/rpl_row_func002.test: Fix test cases to work with non-standard --vardir. mysql-test/t/rpl_row_sp001.test: Fix test cases to work with non-standard --vardir. mysql-test/t/rpl_row_sp011.test: Fix test cases to work with non-standard --vardir. mysql-test/t/rpl_row_trig001.test: Fix test cases to work with non-standard --vardir. mysql-test/t/rpl_row_trig003.test: Fix test cases to work with non-standard --vardir. mysql-test/t/rpl_sp004.test: Fix test cases to work with non-standard --vardir. mysql-test/t/show_check.test: Fix test cases to work with non-standard --vardir. mysql-test/include/partition_1.inc: Fix test cases to work with non-standard --vardir. mysql-test/include/partition_layout.inc: Fix test cases to work with non-standard --vardir. mysql-test/r/ndb_dd_backuprestore.result: Fix test cases to work with non-standard --vardir.
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
|
|
|
|
exec diff $MYSQLTEST_VARDIR/tmp/sp011_master.sql $MYSQLTEST_VARDIR/tmp/sp011_slave.sql;
|
|
|
|
# If all is good, when can cleanup our dump files.
|
|
system rm $MYSQLTEST_VARDIR/tmp/sp011_master.sql;
|
|
system rm $MYSQLTEST_VARDIR/tmp/sp011_slave.sql;
|
|
|
|
# End of 5.0 test case
|