diff options
author | unknown <monty@mysql.com> | 2004-03-30 01:02:21 +0300 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-03-30 01:02:21 +0300 |
commit | 3264eb229430f64086de880fdabd89a6fe28cf84 (patch) | |
tree | dd861b40a83830d42c13a7b9b567c50453b131ce | |
parent | 8fa4af597f6061195faa3b92ae9cfe2b0c7f4f34 (diff) | |
parent | c8164922ea3f88b89131a6c4942c80ed5744ec49 (diff) | |
download | mariadb-git-3264eb229430f64086de880fdabd89a6fe28cf84.tar.gz |
Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1
mysql-test/t/timezone.test:
Auto merged
-rw-r--r-- | mysql-test/t/timezone.test | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/timezone.test b/mysql-test/t/timezone.test index ba65eb72fe6..194602f376c 100644 --- a/mysql-test/t/timezone.test +++ b/mysql-test/t/timezone.test @@ -11,6 +11,8 @@ enable_query_log; DROP TABLE IF EXISTS t1; --enable_warnings +# The following is because of daylight saving time +--replace_result MEST MET show variables like "timezone"; # |