Commit 7d740ed6 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/bug9535 

into neptunus.(none):/home/msvensson/mysql/mysql-5.0


sql/item_strfunc.h:
  Auto merged
parents afaa3c89 804ce01a

mysql-test/r/func_misc.result

+8 −0
Original line number Diff line number Diff line
@@ -51,3 +51,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()` varchar(36) character set utf8 NOT NULL default '',

  `length(uuid())` int(10) NOT NULL default '0'

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

mysql-test/t/func_misc.test

+8 −0
Original line number Diff line number Diff line
@@ -38,3 +38,11 @@ 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;

sql/item_strfunc.h

+6 −1
Original line number Diff line number Diff line
@@ -726,7 +726,12 @@ class Item_func_uuid: public Item_str_func 
  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 *);