diff options
| author | Alexander Barkov <bar@mariadb.org> | 2013-07-10 12:12:27 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2013-07-10 12:12:27 +0400 |
| commit | d98584f56a5ec46d6258bba6250c6c797a678afd (patch) | |
| tree | 7608b63b2a1e8bf9b6f9e74f9a0dd6a5848fbdbb /mysql-test/t/cast.test | |
| parent | 17f3ae267f3b8c189be1671f86902f24ae79cdeb (diff) | |
| download | mariadb-git-d98584f56a5ec46d6258bba6250c6c797a678afd.tar.gz | |
Adding support for the SQL-standard temporal literals.
added:
mysql-test/r/temporal_literal.result
mysql-test/t/temporal_literal.test
modified:
client/mysqlbinlog.cc
include/my_time.h
mysql-test/r/cast.result
mysql-test/r/partition_innodb.result
mysql-test/t/cast.test
mysql-test/t/partition_innodb.test
sql-common/my_time.c
sql/field.cc
sql/item.cc
sql/item.h
sql/item_cmpfunc.cc
sql/item_create.cc
sql/item_create.h
sql/item_strfunc.cc
sql/item_timefunc.cc
sql/item_timefunc.h
sql/sql_select.cc
sql/sql_time.cc
sql/sql_time.h
sql/sql_yacc.yy
storage/spider/spd_db_mysql.cc
Diffstat (limited to 'mysql-test/t/cast.test')
| -rw-r--r-- | mysql-test/t/cast.test | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/t/cast.test b/mysql-test/t/cast.test index 64e8225530b..9cbc941402e 100644 --- a/mysql-test/t/cast.test +++ b/mysql-test/t/cast.test @@ -74,11 +74,11 @@ select 10E+0+'10'; # The following cast creates warnings -select CONVERT(DATE "2004-01-22 21:45:33" USING latin1); -select CONVERT(DATE "2004-01-22 21:45:33",CHAR); -select CONVERT(DATE "2004-01-22 21:45:33",CHAR(4)); -select CONVERT(DATE "2004-01-22 21:45:33",BINARY(4)); -select CAST(DATE "2004-01-22 21:45:33" AS BINARY(4)); +select CONVERT(TIMESTAMP "2004-01-22 21:45:33" USING latin1); +select CONVERT(TIMESTAMP "2004-01-22 21:45:33",CHAR); +select CONVERT(TIMESTAMP "2004-01-22 21:45:33",CHAR(4)); +select CONVERT(TIMESTAMP "2004-01-22 21:45:33",BINARY(4)); +select CAST(TIMESTAMP "2004-01-22 21:45:33" AS BINARY(4)); select CAST(0xb3 as signed); select CAST(0x8fffffffffffffff as signed); select CAST(0xffffffffffffffff as unsigned); |