diff options
| author | unknown <kroki/tomash@moonlight.home> | 2007-03-09 13:17:46 +0300 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.home> | 2007-03-09 13:17:46 +0300 |
| commit | b311d870523b6c1bae7e3a49e9d04d2c30bef5b2 (patch) | |
| tree | 6197d95ef12f5c0b810b541f1b32c7955b0b1d7b /mysql-test/r/timezone2.result | |
| parent | 1b198eeb6893b4095c70df224eafb2c823f8970f (diff) | |
| parent | 0ea47f3ed46011263d696f9852190c6a2edf4772 (diff) | |
| download | mariadb-git-b311d870523b6c1bae7e3a49e9d04d2c30bef5b2.tar.gz | |
Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1
into moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1-bug9953
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/view.result:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
sql/tztime.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
sql/sql_yacc.yy:
SCCS merged
Diffstat (limited to 'mysql-test/r/timezone2.result')
| -rw-r--r-- | mysql-test/r/timezone2.result | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/r/timezone2.result b/mysql-test/r/timezone2.result index f7631e9657a..32db7ea7fa9 100644 --- a/mysql-test/r/timezone2.result +++ b/mysql-test/r/timezone2.result @@ -285,3 +285,14 @@ ldt ldt2 drop table t1; drop function f1; SET GLOBAL log_bin_trust_function_creators = 0; +DROP TABLE IF EXISTS t1; +CREATE TABLE t1 (t TIMESTAMP); +INSERT INTO t1 VALUES (NULL), (NULL); +LOCK TABLES t1 WRITE; +SELECT CONVERT_TZ(NOW(), 'UTC', 'Europe/Moscow') IS NULL; +CONVERT_TZ(NOW(), 'UTC', 'Europe/Moscow') IS NULL +0 +UPDATE t1 SET t = CONVERT_TZ(t, 'UTC', 'Europe/Moscow'); +UNLOCK TABLES; +DROP TABLE t1; +End of 5.1 tests |