mirror of
				https://github.com/MariaDB/server.git
				synced 2025-10-28 17:15:19 +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.
		
			
				
	
	
		
			74 lines
		
	
	
		
			2.5 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			74 lines
		
	
	
		
			2.5 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
| #############################################################################
 | |
| # 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;
 | |
| 
 | |
| # 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
 | |
| 
 | |
| exec diff $MYSQLTEST_VARDIR/tmp/NOW_master.sql $MYSQLTEST_VARDIR/tmp/NOW_slave.sql;
 | |
| 
 | |
| # If all is good, when can cleanup our dump files.
 | |
| system rm $MYSQLTEST_VARDIR/tmp/NOW_master.sql;
 | |
| system rm $MYSQLTEST_VARDIR/tmp/NOW_slave.sql;
 | |
| 
 | |
| sync_slave_with_master;
 | |
| # End of 5.1 test case
 |