database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

cast.result:

Browse Source 
Fixing test results accordingly.
item_timefunc.cc:
  Displaying BINARY or CHAR in error messages,
  depending on the character set.


sql/item_timefunc.cc:
  Displaying BINARY or CHAR in error messages,
  depending on the character set.
mysql-test/r/cast.result:
  Fixing test results accordingly.
This commit is contained in:
unknown
2005-11-21 21:11:28 +04:00
parent f75197201d
commit 8b497b04f3
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,12 +68,12 @@ select CONVERT(DATE "2004-01-22 21:45:33",BINARY(4));
CONVERT(DATE "2004-01-22 21:45:33",BINARY(4)) CONVERT(DATE "2004-01-22 21:45:33",BINARY(4))
2004 2004
Warnings: Warnings:
Warning 1292 Truncated incorrect CHAR(4) value: '2004-01-22 21:45:33' Warning 1292 Truncated incorrect BINARY(4) value: '2004-01-22 21:45:33'
select CAST(DATE "2004-01-22 21:45:33" AS BINARY(4)); select CAST(DATE "2004-01-22 21:45:33" AS BINARY(4));
CAST(DATE "2004-01-22 21:45:33" AS BINARY(4)) CAST(DATE "2004-01-22 21:45:33" AS BINARY(4))
2004 2004
Warnings: Warnings:
Warning 1292 Truncated incorrect CHAR(4) value: '2004-01-22 21:45:33' Warning 1292 Truncated incorrect BINARY(4) value: '2004-01-22 21:45:33'
select CAST(0xb3 as signed); select CAST(0xb3 as signed);
CAST(0xb3 as signed) CAST(0xb3 as signed)
179 179
@ -169,13 +169,13 @@ hex(cast(_latin1'a' AS char(2))) as c5;
c1 c2 c3 c4 c5 c1 c2 c3 c4 c5
ab a ab a 6100 ab a ab a 6100
Warnings: Warnings:
Warning 1292 Truncated incorrect CHAR(2) value: 'abc' Warning 1292 Truncated incorrect BINARY(2) value: 'abc'
Warning 1292 Truncated incorrect CHAR(2) value: 'a ' Warning 1292 Truncated incorrect BINARY(2) value: 'a '
select cast(1000 as CHAR(3)); select cast(1000 as CHAR(3));
cast(1000 as CHAR(3)) cast(1000 as CHAR(3))
100 100
Warnings: Warnings:
Warning 1292 Truncated incorrect CHAR(3) value: '1000' Warning 1292 Truncated incorrect BINARY(3) value: '1000'
create table t1 select create table t1 select
cast(_latin1'ab' AS char) as c1, cast(_latin1'ab' AS char) as c1,
cast(_latin1'a ' AS char) as c2, cast(_latin1'a ' AS char) as c2,
@ -183,8 +183,8 @@ cast(_latin1'abc' AS char(2)) as c3,
cast(_latin1'a ' AS char(2)) as c4, cast(_latin1'a ' AS char(2)) as c4,
cast(_latin1'a' AS char(2)) as c5; cast(_latin1'a' AS char(2)) as c5;
Warnings: Warnings:
Warning 1292 Truncated incorrect CHAR(2) value: 'abc' Warning 1292 Truncated incorrect BINARY(2) value: 'abc'
Warning 1292 Truncated incorrect CHAR(2) value: 'a ' Warning 1292 Truncated incorrect BINARY(2) value: 'a '
select c1,c2,c3,c4,hex(c5) from t1; select c1,c2,c3,c4,hex(c5) from t1;
c1 c2 c3 c4 hex(c5) c1 c2 c3 c4 hex(c5)
ab a ab a 6100 ab a ab a 6100
@ -274,9 +274,9 @@ aac aac
aab aab aab aab
aaa aaa aaa aaa
Warnings: Warnings:
Warning 1292 Truncated incorrect CHAR(2) value: 'aaa' Warning 1292 Truncated incorrect BINARY(2) value: 'aaa'
Warning 1292 Truncated incorrect CHAR(2) value: 'aab' Warning 1292 Truncated incorrect BINARY(2) value: 'aab'
Warning 1292 Truncated incorrect CHAR(2) value: 'aac' Warning 1292 Truncated incorrect BINARY(2) value: 'aac'
SELECT a, CAST(a AS UNSIGNED) FROM t1 ORDER BY CAST(a AS CHAR) ; SELECT a, CAST(a AS UNSIGNED) FROM t1 ORDER BY CAST(a AS CHAR) ;
a CAST(a AS UNSIGNED) a CAST(a AS UNSIGNED)
aaa 3 aaa 3
@ -288,9 +288,9 @@ aaa aa
aab aa aab aa
aac aa aac aa
Warnings: Warnings:
Warning 1292 Truncated incorrect CHAR(2) value: 'aaa' Warning 1292 Truncated incorrect BINARY(2) value: 'aaa'
Warning 1292 Truncated incorrect CHAR(2) value: 'aab' Warning 1292 Truncated incorrect BINARY(2) value: 'aab'
Warning 1292 Truncated incorrect CHAR(2) value: 'aac' Warning 1292 Truncated incorrect BINARY(2) value: 'aac'
DROP TABLE t1; DROP TABLE t1;
select date_add(cast('2004-12-30 12:00:00' as date), interval 0 hour); select date_add(cast('2004-12-30 12:00:00' as date), interval 0 hour);
date_add(cast('2004-12-30 12:00:00' as date), interval 0 hour) date_add(cast('2004-12-30 12:00:00' as date), interval 0 hour)

3
sql/item_timefunc.cc
View File

@ -2357,7 +2357,8 @@ String *Item_char_typecast::val_str(String *str)
if (res->length() > (length= (uint32) res->charpos(cast_length))) if (res->length() > (length= (uint32) res->charpos(cast_length)))
{ // Safe even if const arg { // Safe even if const arg
char char_type[40]; char char_type[40];
my_snprintf(char_type, sizeof(char_type), "CHAR(%lu)", length); my_snprintf(char_type, sizeof(char_type), "%s(%lu)",
cast_cs == &my_charset_bin ? "BINARY" : "CHAR", length);
if (!res->alloced_length()) if (!res->alloced_length())
{ // Don't change const str { // Don't change const str