Commit b7b774ee authored Feb 20, 2007 by unknown

Use "diff_files" instead ot "exec diff"

parent e95e092b

mysql-test/extra/rpl_tests/rpl_row_UUID.test

+1 −1

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@ DROP TABLE test.t2;
		# 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 :-)

		--exec diff $MYSQLTEST_VARDIR/tmp/rpl_row_UUID_master.sql $MYSQLTEST_VARDIR/tmp/rpl_row_UUID_slave.sql;
		diff_files $MYSQLTEST_VARDIR/tmp/rpl_row_UUID_master.sql $MYSQLTEST_VARDIR/tmp/rpl_row_UUID_slave.sql;

		# Cleanup dump files.
		# Long-term "system rm" is not portable; we could live without

mysql-test/extra/rpl_tests/rpl_row_blob.test

+1 −1

Original line number	Diff line number	Diff line
		@@ -179,7 +179,7 @@ connection master;
		--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/rpl_row_blob_master.sql
		--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/rpl_row_blob_slave.sql

		--exec diff $MYSQLTEST_VARDIR/tmp/rpl_row_blob_master.sql $MYSQLTEST_VARDIR/tmp/rpl_row_blob_slave.sql
		diff_files $MYSQLTEST_VARDIR/tmp/rpl_row_blob_master.sql $MYSQLTEST_VARDIR/tmp/rpl_row_blob_slave.sql;

		DROP TABLE IF EXISTS test.t1;
		DROP TABLE IF EXISTS test.t2;

mysql-test/extra/rpl_tests/rpl_row_func003.test

+1 −1

Original line number	Diff line number	Diff line
		@@ -90,7 +90,7 @@ DROP TABLE test.t1;
		# the files yourself to see what is not matching :-) File are located
		# in $MYSQLTEST_VARDIR/tmp

		exec diff $MYSQLTEST_VARDIR/tmp/func003_master.sql $MYSQLTEST_VARDIR/tmp/func003_slave.sql;
		diff_files $MYSQLTEST_VARDIR/tmp/func003_master.sql $MYSQLTEST_VARDIR/tmp/func003_slave.sql;


		# End of 5.0 test case

mysql-test/extra/rpl_tests/rpl_row_sp006.test

+1 −1

Original line number	Diff line number	Diff line
		@@ -84,7 +84,7 @@ DROP DATABASE mysqltest1;
		# the files your self to see what is not matching :-) Failed test
		# Dump files will be located in $MYSQLTEST_VARDIR/tmp.

		exec diff $MYSQLTEST_VARDIR/tmp/sp006_master.sql $MYSQLTEST_VARDIR/tmp/sp006_slave.sql;
		diff_files $MYSQLTEST_VARDIR/tmp/sp006_master.sql $MYSQLTEST_VARDIR/tmp/sp006_slave.sql;

		sync_slave_with_master;

mysql-test/t/rpl_ndb_bank.test

+1 −1

Original line number	Diff line number	Diff line
		@@ -175,7 +175,7 @@ insert into t1 values (1);
		--connection master
		drop table t1;

		--exec diff $MYSQLTEST_VARDIR/tmp/master_BANK.sql $MYSQLTEST_VARDIR/tmp/slave_BANK.sql
		diff_files $MYSQLTEST_VARDIR/tmp/master_BANK.sql $MYSQLTEST_VARDIR/tmp/slave_BANK.sql;

		--dec $2
		}