diff options
author | unknown <mikael/pappa@dator5.(none)> | 2006-07-15 12:01:46 -0400 |
---|---|---|
committer | unknown <mikael/pappa@dator5.(none)> | 2006-07-15 12:01:46 -0400 |
commit | 0fbf14cece7dd0775fd37b9fcbc609debee8e954 (patch) | |
tree | a5420363b161bb067a223eb7e3c3e5a7d23878f9 | |
parent | b7e2a38de7fc1a92c458ad1493fc50694cad90f1 (diff) | |
download | mariadb-git-0fbf14cece7dd0775fd37b9fcbc609debee8e954.tar.gz |
Remove files that tests leave behind
mysql-test/t/ndb_alter_table.test:
Remove file that the test leaves behind
mysql-test/t/partition.test:
Remove file that the other tests leaves behind
mysql-test/t/rpl_ndb_bank.test:
Remove file that the test leaves behind
mysql-test/t/rpl_ndb_dd_advance.test:
Remove file that the test leaves behind
-rw-r--r-- | mysql-test/t/ndb_alter_table.test | 1 | ||||
-rw-r--r-- | mysql-test/t/partition.test | 1 | ||||
-rw-r--r-- | mysql-test/t/rpl_ndb_bank.test | 1 | ||||
-rw-r--r-- | mysql-test/t/rpl_ndb_dd_advance.test | 2 |
4 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/t/ndb_alter_table.test b/mysql-test/t/ndb_alter_table.test index 73c612b203f..fde9f1479f8 100644 --- a/mysql-test/t/ndb_alter_table.test +++ b/mysql-test/t/ndb_alter_table.test @@ -389,6 +389,7 @@ drop index i1 on t1; --disable_warnings --exec $NDB_TOOLS_DIR/ndb_show_tables --p > $MYSQLTEST_VARDIR/master-data/test/tmp.dat LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables; +--exec rm $MYSQLTEST_VARDIR/master-data/test/tmp.dat || true --enable_warnings select 'no_copy' from ndb_show_tables where id = @t1_id and name like '%t1%'; diff --git a/mysql-test/t/partition.test b/mysql-test/t/partition.test index 7d88174304d..1495c4f1c6d 100644 --- a/mysql-test/t/partition.test +++ b/mysql-test/t/partition.test @@ -7,6 +7,7 @@ --disable_warnings drop table if exists t1; +--exec rm $MYSQLTEST_VARDIR/test/db.opt || true --enable_warnings # diff --git a/mysql-test/t/rpl_ndb_bank.test b/mysql-test/t/rpl_ndb_bank.test index 3601c841c54..d6a10e4ccac 100644 --- a/mysql-test/t/rpl_ndb_bank.test +++ b/mysql-test/t/rpl_ndb_bank.test @@ -121,6 +121,7 @@ RESET MASTER; CREATE TABLE IF NOT EXISTS cluster.backup_info (id INT, backup_id INT) ENGINE = HEAP; DELETE FROM cluster.backup_info; LOAD DATA INFILE '../tmp.dat' INTO TABLE cluster.backup_info FIELDS TERMINATED BY ','; +--exec rm $MYSQLTEST_VARDIR/tmp.dat || true --replace_column 1 <the_backup_id> SELECT @the_backup_id:=backup_id FROM cluster.backup_info; let the_backup_id=`select @the_backup_id`; diff --git a/mysql-test/t/rpl_ndb_dd_advance.test b/mysql-test/t/rpl_ndb_dd_advance.test index 30d5deb47ad..1fe36ecd8a1 100644 --- a/mysql-test/t/rpl_ndb_dd_advance.test +++ b/mysql-test/t/rpl_ndb_dd_advance.test @@ -441,7 +441,7 @@ CREATE TEMPORARY TABLE IF NOT EXISTS cluster.backup_info (id INT, backup_id INT) DELETE FROM cluster.backup_info; LOAD DATA INFILE '../tmp.dat' INTO TABLE cluster.backup_info FIELDS TERMINATED BY ','; - +--exec rm $MYSQLTEST_VARDIR/tmp.dat || true --replace_column 1 <the_backup_id> SELECT @the_backup_id:=backup_id FROM cluster.backup_info; |