Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1

mysql-test/t/timezone.test: Auto merged

Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1
mysql-test/t/timezone.test: Auto merged
619e9cba · unknown · ff908d18 · 6b16bf4f · 619e9cba
Commit 619e9cba authored Mar 30, 2004 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

mysql-test/t/timezone.test mysql-test/t/timezone.test +2 -0

No files found.
--- 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";

 #