2839 Patrick Crews 2008-10-02
Bug#39785 Test binlog.binlog_stm_row failing on Pushbuild
Bug#38311 Some tests use 'rm' which is not portable
Fix of broken pushbuild tests for 6.0-5.1.29-rc tree. Also removal of
some 'rm' calls that weren't present in -bugteam trees.
modified:
mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test
mysql-test/suite/binlog/t/binlog_stm_row.test
mysql-test/suite/ndb/t/ndb_alter_table_online.test
mysql-test/suite/ndb_team/t/rpl_ndb_dd_advance.test
mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test
mysql-test/t/drop-no_root.test
mysql-test/t/loadxml.test
mysql-test/t/mysqlbinlog_base64.test
mysql-test/t/outfile.test
mysql-test/t/partition_mgm_err2.test
2838 Andrei Elkin 2008-10-02 [merge]
merge with 5.1-5.1.29 (backported from 6.0-main fixes of bug#36968)
modified:
mysql-test/lib/mtr_report.pl
=== modified file 'mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test'
--- a/mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test 2008-02-13 23:02:25 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test 2008-10-02 14:14:27 +0000
@@ -296,8 +296,8 @@ diff_files $MYSQLTEST_VARDIR/tmp/master_
## Note: Ths files should only get removed, if the above diff succeeds.
---exec rm $MYSQLTEST_VARDIR/tmp/master_apply_status.sql
---exec rm $MYSQLTEST_VARDIR/tmp/slave_apply_status.sql
+--remove_file $MYSQLTEST_VARDIR/tmp/master_apply_status.sql
+--remove_file $MYSQLTEST_VARDIR/tmp/slave_apply_status.sql
# End of 5.1 Test
=== modified file 'mysql-test/suite/binlog/t/binlog_stm_row.test'
--- a/mysql-test/suite/binlog/t/binlog_stm_row.test 2008-09-29 13:53:40 +0000
+++ b/mysql-test/suite/binlog/t/binlog_stm_row.test 2008-10-02 14:14:27 +0000
@@ -55,7 +55,7 @@ let $wait_condition=
--echo # con1
let $wait_condition=
SELECT COUNT(*) = 1 FROM information_schema.processlist WHERE
- state = "Locked" and info = "INSERT INTO t2 VALUES (3)";
+ state = "Table lock" and info = "INSERT INTO t2 VALUES (3)";
--source include/wait_condition.inc
SELECT RELEASE_LOCK('Bug#34306');
--connection con2
=== modified file 'mysql-test/suite/ndb/t/ndb_alter_table_online.test'
--- a/mysql-test/suite/ndb/t/ndb_alter_table_online.test 2008-04-19 19:59:48 +0000
+++ b/mysql-test/suite/ndb/t/ndb_alter_table_online.test 2008-10-02 14:14:27 +0000
@@ -685,7 +685,7 @@ b INT COLUMN_FORMAT FIXED)ROW_FORMAT=DYN
--echo * Cleanup Section
--echo ********************
---exec rm $MYSQLTEST_VARDIR/master-data/test/tmp.dat || true
+--remove_file $MYSQLTEST_VARDIR/master-data/test/tmp.dat
DROP TABLE t1;
DROP TABLE ndb_show_tables_results;
# End of 5.1 Test Case
=== modified file 'mysql-test/suite/ndb_team/t/rpl_ndb_dd_advance.test'
--- a/mysql-test/suite/ndb_team/t/rpl_ndb_dd_advance.test 2008-01-04 15:33:40 +0000
+++ b/mysql-test/suite/ndb_team/t/rpl_ndb_dd_advance.test 2008-10-02 14:14:27 +0000
@@ -299,7 +299,7 @@ CREATE TEMPORARY TABLE IF NOT EXISTS mys
DELETE FROM mysql.backup_info;
LOAD DATA INFILE '../tmp.dat' INTO TABLE mysql.backup_info FIELDS TERMINATED BY ',';
---exec rm $MYSQLTEST_VARDIR/tmp.dat || true
+--remove_file $MYSQLTEST_VARDIR/tmp.dat
--replace_column 1 <the_backup_id>
SELECT @the_backup_id:=backup_id FROM mysql.backup_info;
@@ -424,7 +424,7 @@ diff_files $MYSQLTEST_VARDIR/tmp/RPL_DD_
## Note: Ths files should only get removed, if the above diff succeeds.
---exec rm $MYSQLTEST_VARDIR/tmp/RPL_DD_ADV_M.sql
---exec rm $MYSQLTEST_VARDIR/tmp/RPL_DD_ADV_S.sql
+--remove_file $MYSQLTEST_VARDIR/tmp/RPL_DD_ADV_M.sql
+--remove_file $MYSQLTEST_VARDIR/tmp/RPL_DD_ADV_S.sql
# End 5.1 test case
=== modified file 'mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test'
--- a/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test 2008-05-15 20:56:38 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test 2008-10-02 14:14:27 +0000
@@ -160,7 +160,7 @@ connection master;
# We should be gold by the time, so I will get rid of our file.
---exec rm $MYSQLTEST_VARDIR/tmp/master.sql
+--remove_file $MYSQLTEST_VARDIR/tmp/master.sql
# this test for position option
@@ -243,7 +243,7 @@ connection master;
# We should be gold by the time, so I will get rid of our file.
---exec rm $MYSQLTEST_VARDIR/tmp/remote.sql
+--remove_file $MYSQLTEST_VARDIR/tmp/remote.sql
################### End Bug 17654 ######################
# What is the point of this test? It seems entirely pointless. It
@@ -344,9 +344,9 @@ FLUSH LOGS;
--diff_files $MYSQLTEST_VARDIR/tmp/local.sql $MYSQLTEST_VARDIR/tmp/remote.sql
---exec rm $MYSQLTEST_VARDIR/tmp/remote.sql
+--remove_file $MYSQLTEST_VARDIR/tmp/remote.sql
---exec rm $MYSQLTEST_VARDIR/tmp/local.sql
+--remove_file $MYSQLTEST_VARDIR/tmp/local.sql
DROP TABLE IF EXISTS t1, t2, t3, t04, t05, t4, t5;
sync_slave_with_master;
=== modified file 'mysql-test/t/drop-no_root.test'
--- a/mysql-test/t/drop-no_root.test 2008-06-04 18:10:12 +0000
+++ b/mysql-test/t/drop-no_root.test 2008-10-02 14:14:27 +0000
@@ -37,8 +37,8 @@ SELECT DATABASE();
--echo
--echo rm mysql_test/t1.MYD mysql_test/t1.MYI
---exec rm $MYSQLTEST_VARDIR/master-data/mysql_test/t1.MYD
---exec rm $MYSQLTEST_VARDIR/master-data/mysql_test/t1.MYI
+--remove_file $MYSQLTEST_VARDIR/master-data/mysql_test/t1.MYD
+--remove_file $MYSQLTEST_VARDIR/master-data/mysql_test/t1.MYI
--echo
DROP DATABASE mysql_test;
=== modified file 'mysql-test/t/loadxml.test'
--- a/mysql-test/t/loadxml.test 2007-11-14 20:11:50 +0000
+++ b/mysql-test/t/loadxml.test 2008-10-02 14:14:27 +0000
@@ -45,6 +45,6 @@ select 1 as xml;
#
# Clean up
#
---system rm $MYSQLTEST_VARDIR/loadxml-dump.xml
+--remove_file $MYSQLTEST_VARDIR/loadxml-dump.xml
drop table t1;
=== modified file 'mysql-test/t/mysqlbinlog_base64.test'
--- a/mysql-test/t/mysqlbinlog_base64.test 2007-02-23 21:23:54 +0000
+++ b/mysql-test/t/mysqlbinlog_base64.test 2008-10-02 14:14:27 +0000
@@ -62,6 +62,6 @@ select count(*) from t2;
#
# Test cleanup
#
---exec rm $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
+--remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
drop table t1;
drop table t2;
=== modified file 'mysql-test/t/outfile.test'
--- a/mysql-test/t/outfile.test 2008-09-30 20:14:37 +0000
+++ b/mysql-test/t/outfile.test 2008-10-02 14:14:27 +0000
@@ -3,7 +3,7 @@ disable_query_log;
# Server are started in "var/master-data", so "../tmp" will be "var/tmp"
eval set @tmpdir="../tmp";
enable_query_log;
-#-- source include/have_outfile.inc
+-- source include/have_outfile.inc
#
# test of into outfile|dumpfile
=== modified file 'mysql-test/t/partition_mgm_err2.test'
--- a/mysql-test/t/partition_mgm_err2.test 2007-04-25 18:21:55 +0000
+++ b/mysql-test/t/partition_mgm_err2.test 2008-10-02 14:14:27 +0000
@@ -12,7 +12,7 @@
# BUG: 14354 Partitions: data directory clause fails
#
--system rm -rf $MYSQLTEST_VARDIR/tmp/bug14354
---system mkdir $MYSQLTEST_VARDIR/tmp/bug14354
+--mkdir $MYSQLTEST_VARDIR/tmp/bug14354
disable_query_log;
eval CREATE TABLE t1 (id int) PARTITION BY RANGE(id) (
PARTITION p1 VALUES LESS THAN (20) ENGINE=myisam
| Thread |
|---|
| • bzr push into mysql-6.0 branch (patrick.crews:2838 to 2839) Bug#38311Bug#39785 | Patrick Crews | 2 Oct |
