summaryrefslogtreecommitdiff
path: root/mysql-test/suite/maria/r
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2010-01-27 18:41:05 +0100
committerunknown <knielsen@knielsen-hq.org>2010-01-27 18:41:05 +0100
commit7c8983e99e459f86f9626e6e26828f6dfaa1814d (patch)
treed3bcd680454a62563578e8cc6fffd67cd9b90622 /mysql-test/suite/maria/r
parent80ac8858d5967f525d9b1b798d43146ae0303b53 (diff)
downloadmariadb-git-7c8983e99e459f86f9626e6e26828f6dfaa1814d.tar.gz
Fix test failures due to previous change of not setting TZ by default.
Fix by explicitly setting timezone for a few more tests that need it. (We avoid setting TZ everywhere by default as this breaks some tests on windows). Also add fix of two other windows failures due to non-portable suppressions, thanks to Alex Budovski. mysql-test/mysql-test-run.pl: Don't let --timezone option from one test stray into the next test (mostly to make results more deterministic rather than depend on whatever test happens to run just before). mysql-test/suite/maria/r/maria-recover.result: Fix suppression pattern to also work with Windows \ path separator. mysql-test/suite/maria/t/maria-recover.test: Fix suppression pattern to also work with Windows \ path separator. mysql-test/suite/parts/inc/partition_timestamp.inc: Set timezone explicitly for test that needs it. mysql-test/suite/parts/r/partition_recover_myisam.result: Fix suppression pattern to also work with Windows \ path separator. mysql-test/suite/parts/t/partition_recover_myisam.test: Fix suppression pattern to also work with Windows \ path separator. mysql-test/t/mysqlbinlog_row-master.opt: Set timezone explicitly for test that needs it. mysql-test/t/mysqlbinlog_row_innodb-master.opt: Set timezone explicitly for test that needs it. mysql-test/t/mysqlbinlog_row_myisam-master.opt: Set timezone explicitly for test that needs it. mysql-test/t/mysqlbinlog_row_trans-master.opt: Set timezone explicitly for test that needs it.
Diffstat (limited to 'mysql-test/suite/maria/r')
-rw-r--r--mysql-test/suite/maria/r/maria-recover.result3
1 files changed, 0 insertions, 3 deletions
diff --git a/mysql-test/suite/maria/r/maria-recover.result b/mysql-test/suite/maria/r/maria-recover.result
index b4f5c21b26b..aee4119304f 100644
--- a/mysql-test/suite/maria/r/maria-recover.result
+++ b/mysql-test/suite/maria/r/maria-recover.result
@@ -1,6 +1,3 @@
-call mtr.add_suppression("Checking table: '.\/mysqltest\/t_corrupted2'");
-call mtr.add_suppression("Recovering table: '.\/mysqltest\/t_corrupted2'");
-call mtr.add_suppression("Table '.\/mysqltest\/t_corrupted2' is marked as crashed and should be repaired");
select @@global.maria_recover;
@@global.maria_recover
BACKUP