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

Merge abarkov@bk-internal:/home/bk/mysql-5.0

Browse Source 
into  mysql.com:/usr/home/bar/mysql-5.0.char1
This commit is contained in:
unknown
2005-10-14 08:20:02 +05:00
parent 4083d45644 dddb6812dd
commit 2aa10d2464
4 changed files with 71 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
mysql-test/r/ctype_utf8.result
View File

@ -1064,46 +1064,56 @@ xxx
yyy yyy
DROP TABLE t1; DROP TABLE t1;
set names utf8; set names utf8;
select hex(char(1)); select hex(char(1 using utf8));
hex(char(1)) hex(char(1 using utf8))
01 01
select char(0xd1,0x8f); select char(0xd1,0x8f using utf8);
char(0xd1,0x8f) char(0xd1,0x8f using utf8)
я я
select char(0xd18f); select char(0xd18f using utf8);
char(0xd18f) char(0xd18f using utf8)
я я
select char(53647); select char(53647 using utf8);
char(53647) char(53647 using utf8)
я я
select char(0xff,0x8f); select char(0xff,0x8f using utf8);
char(0xff,0x8f) char(0xff,0x8f using utf8)
<EFBFBD><EFBFBD> <EFBFBD><EFBFBD>
Warnings:
Warning 1300 Invalid utf8 character string: 'FF8F'
set sql_mode=traditional; set sql_mode=traditional;
select char(0xff,0x8f); select char(0xff,0x8f using utf8);
char(0xff,0x8f) char(0xff,0x8f using utf8)
<EFBFBD><EFBFBD> NULL
select convert(char(0xff,0x8f) using utf8); Warnings:
convert(char(0xff,0x8f) using utf8) Error 1300 Invalid utf8 character string: 'FF8F'
<EFBFBD><EFBFBD> select char(195 using utf8);
select char(195); char(195 using utf8)
char(195) NULL
<EFBFBD> Warnings:
select convert(char(195) using utf8); Error 1300 Invalid utf8 character string: 'C3'
convert(char(195) using utf8) select char(196 using utf8);
<EFBFBD> char(196 using utf8)
select char(196); NULL
char(196) Warnings:
<EFBFBD> Error 1300 Invalid utf8 character string: 'C4'
select convert(char(196) using utf8); select char(2557 using utf8);
convert(char(196) using utf8) char(2557 using utf8)
<EFBFBD> NULL
Warnings:
Error 1300 Invalid utf8 character string: 'FD'
select hex(convert(char(2557 using latin1) using utf8));
hex(convert(char(2557 using latin1) using utf8))
09C3BD
select hex(char(195));
hex(char(195))
C3
select hex(char(196));
hex(char(196))
C4
select hex(char(2557)); select hex(char(2557));
hex(char(2557)) hex(char(2557))
09FD 09FD
select hex(convert(char(2557) using utf8));
hex(convert(char(2557) using utf8))
09FD
set names utf8; set names utf8;
create table t1 (a char(1)) default character set utf8; create table t1 (a char(1)) default character set utf8;
create table t2 (a char(1)) default character set utf8; create table t2 (a char(1)) default character set utf8;

34
mysql-test/t/ctype_utf8.test
View File

@ -871,22 +871,32 @@ DROP TABLE t1;
# #
set names utf8; set names utf8;
# correct value # correct value
select hex(char(1)); select hex(char(1 using utf8));
select char(0xd1,0x8f); select char(0xd1,0x8f using utf8);
select char(0xd18f); select char(0xd18f using utf8);
select char(53647); select char(53647 using utf8);
# incorrect value: return with warning # incorrect value: return with warning
select char(0xff,0x8f); select char(0xff,0x8f using utf8);
# incorrect value in strict mode: return NULL with "Error" level warning # incorrect value in strict mode: return NULL with "Error" level warning
set sql_mode=traditional; set sql_mode=traditional;
select char(0xff,0x8f); select char(0xff,0x8f using utf8);
select convert(char(0xff,0x8f) using utf8); select char(195 using utf8);
select char(195); select char(196 using utf8);
select convert(char(195) using utf8); select char(2557 using utf8);
select char(196);
select convert(char(196) using utf8); #
# Check convert + char + using
#
select hex(convert(char(2557 using latin1) using utf8));
#
# char() without USING returns "binary" by default, any argument is ok
#
select hex(char(195));
select hex(char(196));
select hex(char(2557)); select hex(char(2557));
select hex(convert(char(2557) using utf8));
# #
# Bug#12891: UNION doesn't return DISTINCT result for multi-byte characters # Bug#12891: UNION doesn't return DISTINCT result for multi-byte characters

9
sql/item_strfunc.h
View File

@ -480,12 +480,15 @@ public:
class Item_func_char :public Item_str_func class Item_func_char :public Item_str_func
{ {
public: public:
Item_func_char(List<Item> &list) :Item_str_func(list) {} Item_func_char(List<Item> &list) :Item_str_func(list)
{ collation.set(&my_charset_bin); }
Item_func_char(List<Item> &list, CHARSET_INFO *cs) :Item_str_func(list)
{ collation.set(cs); }
String *val_str(String *); String *val_str(String *);
void fix_length_and_dec() void fix_length_and_dec()
{ {
collation.set(&my_charset_bin); maybe_null=0;
maybe_null=0; max_length=arg_count; max_length=arg_count * collation.collation->mbmaxlen;
} }
const char *func_name() const { return "char"; } const char *func_name() const { return "char"; }
}; };

2
sql/sql_yacc.yy
View File

@ -4536,6 +4536,8 @@ simple_expr:
{ $$= new Item_func_atan($3,$5); } { $$= new Item_func_atan($3,$5); }
| CHAR_SYM '(' expr_list ')' | CHAR_SYM '(' expr_list ')'
{ $$= new Item_func_char(*$3); } { $$= new Item_func_char(*$3); }
| CHAR_SYM '(' expr_list USING charset_name ')'
{ $$= new Item_func_char(*$3, $5); }
| CHARSET '(' expr ')' | CHARSET '(' expr ')'
{ $$= new Item_func_charset($3); } { $$= new Item_func_charset($3); }
| COALESCE '(' expr_list ')' | COALESCE '(' expr_list ')'