summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-03-30 01:02:21 +0300
committerunknown <monty@mysql.com>2004-03-30 01:02:21 +0300
commit619e9cbadd5fa4dc0fa9beb85925c3404676b811 (patch)
treedd861b40a83830d42c13a7b9b567c50453b131ce
parentff908d18a27247c3b4206ce49977c4a7c73792be (diff)
parent6b16bf4ffd6c9746fff8826840d27d94668f4fc0 (diff)
downloadmariadb-git-619e9cbadd5fa4dc0fa9beb85925c3404676b811.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.test2
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";
#