1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug9535/my41-bug9535

Browse Source 
into  devsrv-b.mysql.com:/space/magnus/my41-bug9535
This commit is contained in:
unknown 2005-12-07 15:46:57 +01:00
commit ce039c5ed6
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/func_misc.result
View File

@ -49,3 +49,11 @@ select a from t1 where mid(a+0,6,3) = ( mid(20040106123400,6,3) );
a
2004-01-06 12:34:00
drop table t1;
create table t1 as select uuid(), length(uuid());
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`uuid()` char(36) character set utf8 NOT NULL default '',
`length(uuid())` int(10) NOT NULL default '0'
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;

5
mysql-test/t/func_misc.test
View File

@ -38,4 +38,9 @@ select a from t1 where mid(a+0,6,3) = ( mid(20040106123400,6,3) );
drop table t1;
# Test for BUG#9535
create table t1 as select uuid(), length(uuid());
show create table t1;
drop table t1;
# End of 4.1 tests

7
sql/item_strfunc.h
View File

@ -748,7 +748,12 @@ public:
Item_func_uuid(): Item_str_func() {}
void fix_length_and_dec() {
collation.set(system_charset_info);
max_length= UUID_LENGTH;
/*
NOTE! uuid() should be changed to use 'ascii'
charset when hex(), format(), md5(), etc, and implicit
number-to-string conversion will use 'ascii'
*/
max_length= UUID_LENGTH * system_charset_info->mbmaxlen;
}
const char *func_name() const{ return "uuid"; }
String *val_str(String *);