summaryrefslogtreecommitdiff
path: root/mysql-test/include/ps_conv.inc
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2010-01-19 11:36:52 +0100
committerunknown <knielsen@knielsen-hq.org>2010-01-19 11:36:52 +0100
commit80ac8858d5967f525d9b1b798d43146ae0303b53 (patch)
treee423f62e75e1af5c1df4f94dd13c2f1196493d61 /mysql-test/include/ps_conv.inc
parent159ff4c12c339ccd6c6d9386a2486a535b1e0932 (diff)
downloadmariadb-git-80ac8858d5967f525d9b1b798d43146ae0303b53.tar.gz
Fix Windows test failures in binlog tests in certain time zones.
On Unix systems TZ can be set to change the time zone for specific processes only. But on Windows this does not fully work. It changes some aspects of time zones in the system but not others (notably localtime() vs. file system time stamps). This causes test failures in Windows in certain time zones (but not all), where PURGE BEFORE DATE statements get the wrong files when TZ is set to +03:00 by default. Fix by only setting TZ in the small number of tests that really need it, and leave it untouched in the rest. Thanks to Alex Budovski for helping with this. mysql-test/include/ps_conv.inc: Explicitly set TIME_ZONE, as mysql-test-run.pl now does not set it. mysql-test/mysql-test-run.pl: Do not set TZ by default, as it causes problems on Windows. mysql-test/suite/binlog/r/binlog_unsafe.result: Explicitly set TIME_ZONE, as mysql-test-run.pl now does not set it. mysql-test/suite/binlog/t/binlog_unsafe.test: Explicitly set TIME_ZONE, as mysql-test-run.pl now does not set it. mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result: Explicitly set TIME_ZONE, as mysql-test-run.pl now does not set it. mysql-test/suite/rpl/t/rpl_mixed_ddl_dml.test: Explicitly set TIME_ZONE, as mysql-test-run.pl now does not set it. mysql-test/t/mysqlbinlog2-master.opt: mysql-test-run.pl no longer sets TZ by default, so set it explicitly for this particular test.
Diffstat (limited to 'mysql-test/include/ps_conv.inc')
-rw-r--r--mysql-test/include/ps_conv.inc3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/include/ps_conv.inc b/mysql-test/include/ps_conv.inc
index 8cbe9450063..9ac943d5bdd 100644
--- a/mysql-test/include/ps_conv.inc
+++ b/mysql-test/include/ps_conv.inc
@@ -30,6 +30,9 @@
--disable_warnings
drop table if exists t5 ;
--enable_warnings
+--disable_query_log
+SET TIME_ZONE= '+03:00';
+--enable_query_log
set @arg01= 8;
set @arg02= 8.0;
set @arg03= 80.00000000000e-1;