database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge bk-internal:/home/bk/mysql-5.0-maint

Browse Source 
into  rama.(none):/home/jimw/my/mysql-5.0-17903
This commit is contained in:
unknown
2006-07-18 10:58:44 -07:00
parent 7f2140d3ed 2fc276d54f
commit d13a39b583
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/r/cast.result
View File

@@ -381,3 +381,14 @@ DROP TABLE t1;
select cast(NULL as decimal(6)) as t1; select cast(NULL as decimal(6)) as t1;
t1 t1
NULL NULL
set names latin1;
select hex(cast('a' as char(2) binary));
hex(cast('a' as char(2) binary))
61
select hex(cast('a' as binary(2)));
hex(cast('a' as binary(2)))
6100
select hex(cast('a' as char(2) binary));
hex(cast('a' as char(2) binary))
61
End of 5.0 tests

14
mysql-test/t/cast.test
View File

@@ -204,7 +204,19 @@ SELECT CAST(v AS DECIMAL), CAST(tt AS DECIMAL), CAST(t AS DECIMAL),
CAST(mt AS DECIMAL), CAST(lt AS DECIMAL) from t1; CAST(mt AS DECIMAL), CAST(lt AS DECIMAL) from t1;
DROP TABLE t1; DROP TABLE t1;
# Bug @10237 (CAST(NULL DECIMAL) crashes server)
#
# Bug #10237 (CAST(NULL DECIMAL) crashes server)
# #
select cast(NULL as decimal(6)) as t1; select cast(NULL as decimal(6)) as t1;
#
# Bug #17903: cast to char results in binary
#
set names latin1;
select hex(cast('a' as char(2) binary));
select hex(cast('a' as binary(2)));
select hex(cast('a' as char(2) binary));
--echo End of 5.0 tests

2
sql/sql_yacc.yy
View File

@@ -3089,7 +3089,7 @@ opt_bin_mod:
| BINARY { Lex->type|= BINCMP_FLAG; }; | BINARY { Lex->type|= BINCMP_FLAG; };
opt_bin_charset: opt_bin_charset:
/* empty */ { } /* empty */ { Lex->charset= NULL; }
| ASCII_SYM { Lex->charset=&my_charset_latin1; } | ASCII_SYM { Lex->charset=&my_charset_latin1; }
| UNICODE_SYM | UNICODE_SYM
{ {