mirror of
				https://github.com/MariaDB/server.git
				synced 2025-10-31 15:50:51 +03:00 
			
		
		
		
	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.
		
			
				
	
	
		
			98 lines
		
	
	
		
			2.7 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			98 lines
		
	
	
		
			2.7 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
| #############################################################################
 | |
| # Original Author: JBM                                                      #
 | |
| # Original Date: Aug/14/2005                                                #
 | |
| #############################################################################
 | |
| # Test: This test contains two sp that create and drop tables, insert and   #
 | |
| #       updated data and uses the NOW() function.                           #
 | |
| #############################################################################
 | |
| 
 | |
| 
 | |
| # Includes
 | |
| -- 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 TABLE IF EXISTS test.t2;
 | |
| DROP TABLE IF EXISTS test.t1;
 | |
| DROP TABLE IF EXISTS test.t3;
 | |
| --enable_warnings
 | |
| # End of cleanup
 | |
| 
 | |
| # Begin test section 1
 | |
| 
 | |
| delimiter |;
 | |
| CREATE PROCEDURE test.p1()
 | |
| BEGIN
 | |
|   CREATE TABLE IF NOT EXISTS test.t1(a INT,PRIMARY KEY(a));
 | |
|   CREATE TABLE IF NOT EXISTS test.t2(a INT,PRIMARY KEY(a));
 | |
|   INSERT INTO test.t1 VALUES (4),(2),(1),(3);
 | |
|   UPDATE test.t1 SET a=a+4 WHERE a=4;
 | |
|   INSERT INTO test.t2 (a) SELECT t1.a FROM test.t1;
 | |
|   UPDATE test.t1 SET a=a+4 WHERE a=8;
 | |
|   CREATE TABLE IF NOT EXISTS test.t3(n MEDIUMINT NOT NULL AUTO_INCREMENT, f FLOAT, d DATETIME, PRIMARY KEY(n));
 | |
| END|
 | |
| CREATE PROCEDURE test.p2()
 | |
| BEGIN
 | |
|   DROP TABLE IF EXISTS test.t1;
 | |
|   DROP TABLE IF EXISTS test.t2;
 | |
|   INSERT INTO test.t3 VALUES(NULL,11111111.233333,NOW());
 | |
| END|
 | |
| delimiter ;|
 | |
| 
 | |
| CALL test.p1();
 | |
| SELECT * FROM test.t1;
 | |
| SELECT * FROM test.t2;
 | |
| save_master_pos;
 | |
| connection slave;
 | |
| sync_with_master;
 | |
| SELECT * FROM test.t1;
 | |
| SELECT * FROM test.t2;
 | |
| 
 | |
| connection master;
 | |
| CALL test.p2();
 | |
| USE test;
 | |
| SHOW TABLES;
 | |
| #SELECT * FROM test.t3;
 | |
| save_master_pos;
 | |
| connection slave;
 | |
| sync_with_master;
 | |
| USE test;
 | |
| SHOW TABLES;
 | |
| #SELECT * FROM test.t3;
 | |
| 
 | |
| connection master;
 | |
| CALL test.p1();
 | |
| SELECT * FROM test.t1;
 | |
| SELECT * FROM test.t2;
 | |
| #SELECT * FROM test.t3;
 | |
| save_master_pos;
 | |
| connection slave;
 | |
| sync_with_master;
 | |
| SELECT * FROM test.t1;
 | |
| SELECT * FROM test.t2;
 | |
| #SELECT * FROM test.t3;
 | |
| 
 | |
| --exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/sp004_master.sql
 | |
| --exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/sp004_slave.sql
 | |
| 
 | |
| # Cleanup
 | |
| connection master;
 | |
| #show binlog events;
 | |
| DROP PROCEDURE IF EXISTS test.p1;
 | |
| DROP PROCEDURE IF EXISTS test.p2;
 | |
| DROP TABLE IF EXISTS test.t1;
 | |
| DROP TABLE IF EXISTS test.t2;
 | |
| DROP TABLE IF EXISTS test.t3;
 | |
| sync_slave_with_master;
 | |
| 
 | |
| # If the test fails, you will need to diff the dumps to see why.
 | |
| 
 | |
| -- exec diff $MYSQLTEST_VARDIR/tmp/sp004_master.sql $MYSQLTEST_VARDIR/tmp/sp004_slave.sql
 | |
| 
 | |
| 
 | |
| # End of 5.0 test case
 |