Commit 6fcff14c authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/local/mysql/mysql-5.1-varfix2 

into  mysql.com:/usr/local/mysql/tmpbuild-5.1
parents 1b6e7fdf a71fb640

mysql-test/extra/rpl_tests/rpl_row_001.test

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
-- source include/have_binlog_format_row.inc



CREATE TABLE t1 (word CHAR(20) NOT NULL);

LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1;

LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1;

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

eval LOAD DATA LOCAL INFILE '$MYSQL_TEST_DIR/std_data/words.dat' INTO TABLE t1;

SELECT * FROM t1  ORDER BY word LIMIT 10;

mysql-test/extra/rpl_tests/rpl_row_UUID.test

+3 −3
Original line number Diff line number Diff line
@@ -56,8 +56,8 @@ SHOW CREATE TABLE test.t1; 
# then LOAD DATA INFILE in slave, and use a query to compare.

# This would have the advantage that it would not assume

# the system has a 'diff'

--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/rpl_row_UUID_master.sql

--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/rpl_row_UUID_slave.sql

--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/rpl_row_UUID_master.sql

--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/rpl_row_UUID_slave.sql



connection master;

# Let's cleanup
@@ -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 ./var/tmp/rpl_row_UUID_master.sql ./var/tmp/rpl_row_UUID_slave.sql;

--exec diff $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

+3 −3
Original line number Diff line number Diff line
@@ -176,10 +176,10 @@ connection master; 
--echo



# Post test clean up section

--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/rpl_row_blob_master.sql

--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/rpl_row_blob_slave.sql

--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 ./var/tmp/rpl_row_blob_master.sql ./var/tmp/rpl_row_blob_slave.sql

--exec diff $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_charset.test

+2 −2
Original line number Diff line number Diff line
@@ -162,8 +162,8 @@ select hex(c1), hex(c2) from t1; 


connection master;

# Let's have a look at generated SETs.

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

#--exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000001 

--replace_result $MYSQLTEST_VARDIR MYSQL_TEST_DIR/var

#--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000001 

drop table t1;

sync_slave_with_master;

mysql-test/extra/rpl_tests/rpl_row_func003.test

+4 −4
Original line number Diff line number Diff line
@@ -77,8 +77,8 @@ SET AUTOCOMMIT=1; 


# time to dump the databases and so we can see if they match



--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/func003_master.sql

--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/func003_slave.sql

--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/func003_master.sql

--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/func003_slave.sql



# First lets cleanupi

DROP FUNCTION test.f1;
@@ -88,9 +88,9 @@ DROP TABLE test.t1; 
# the test will show that the diff statement failed and no reject file

# will be created. You will need to go to the mysql-test dir and diff

# the files yourself to see what is not matching :-) File are located

# in mysql-test/var/tmp

# in $MYSQLTEST_VARDIR/tmp



exec diff ./var/tmp/func003_master.sql ./var/tmp/func003_slave.sql;

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





# End of 5.0 test case