Commit 23457a33 authored by unknown's avatar unknown

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.
parent 6d964ec4
...@@ -3457,6 +3457,8 @@ sub run_testcase ($$) { ...@@ -3457,6 +3457,8 @@ sub run_testcase ($$) {
my $timezone= timezone($tinfo); my $timezone= timezone($tinfo);
if ($timezone ne 'DEFAULT') { if ($timezone ne 'DEFAULT') {
$ENV{'TZ'}= $timezone; $ENV{'TZ'}= $timezone;
} else {
delete($ENV{'TZ'});
} }
mtr_verbose("Setting timezone: $timezone"); mtr_verbose("Setting timezone: $timezone");
......
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; select @@global.maria_recover;
@@global.maria_recover @@global.maria_recover
BACKUP BACKUP
......
...@@ -2,9 +2,13 @@ ...@@ -2,9 +2,13 @@
--source include/have_maria.inc --source include/have_maria.inc
call mtr.add_suppression("Checking table: '.\/mysqltest\/t_corrupted2'"); --disable_query_log
call mtr.add_suppression("Recovering table: '.\/mysqltest\/t_corrupted2'"); # Note: \\. matches a single period. We use '.' as directory separator to
call mtr.add_suppression("Table '.\/mysqltest\/t_corrupted2' is marked as crashed and should be repaired"); # account for Unix and Windows variation.
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");
--enable_query_log
# Note: we're setting an environment variable (not prefixing it by $), # Note: we're setting an environment variable (not prefixing it by $),
# so that the perl code below can access it. # so that the perl code below can access it.
......
...@@ -48,6 +48,7 @@ show create table t3; ...@@ -48,6 +48,7 @@ show create table t3;
let $count=12; let $count=12;
--echo $count inserts; --echo $count inserts;
--disable_query_log --disable_query_log
SET TIME_ZONE= '+03:00';
begin; begin;
while ($count) while ($count)
{ {
......
call mtr.add_suppression("./test/t1_will_crash");
call mtr.add_suppression("Got an error from unknown thread, ha_myisam.cc");
CREATE TABLE t1_will_crash (a INT, KEY (a)) ENGINE=MyISAM; CREATE TABLE t1_will_crash (a INT, KEY (a)) ENGINE=MyISAM;
INSERT INTO t1_will_crash VALUES (1), (2), (3), (4), (5), (6), (7), (8), (9), (10), (11); INSERT INTO t1_will_crash VALUES (1), (2), (3), (4), (5), (6), (7), (8), (9), (10), (11);
FLUSH TABLES; FLUSH TABLES;
......
# test the auto-recover (--myisam-recover) of partitioned myisam tables # test the auto-recover (--myisam-recover) of partitioned myisam tables
call mtr.add_suppression("./test/t1_will_crash"); --disable_query_log
call mtr.add_suppression("..test.t1_will_crash");
call mtr.add_suppression("Got an error from unknown thread, ha_myisam.cc"); call mtr.add_suppression("Got an error from unknown thread, ha_myisam.cc");
--enable_query_log
--source include/have_partition.inc --source include/have_partition.inc
--disable_warnings --disable_warnings
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment