Commit e948154c authored by unknown's avatar unknown
Browse files

Bug 6206: ENUMs are not case sensitive even if declared BINARY 

The same problem with SET columns:

find_set() now executes find_type2() to do charset aware search,
instead of always using system_charset_info comparison.
parent 2e7b3801

mysql-test/r/type_set.result

+33 −0
Original line number Diff line number Diff line
@@ -15,3 +15,36 @@ t1 CREATE TABLE `t1` ( 
drop table t1;

CREATE TABLE t1 (   user varchar(64) NOT NULL default '',   path varchar(255) NOT NULL default '',   privilege   set('select','RESERVED30','RESERVED29','RESERVED28','RESERVED27','RESERVED26',   'RESERVED25','RESERVED24','data.delete','RESERVED22','RESERVED21',   'RESERVED20','data.insert.none','data.insert.approve',   'data.insert.delete','data.insert.move','data.insert.propose',   'data.insert.reject','RESERVED13','RESERVED12','RESERVED11','RESERVED10',   'RESERVED09','data.update','RESERVED07','RESERVED06','RESERVED05',   'RESERVED04','metadata.delete','metadata.put','RESERVED01','RESERVED00')   NOT NULL default '',   KEY user (user)   ) ENGINE=MyISAM CHARSET=utf8;

DROP TABLE t1;

set names latin1;

create table t1 (s set ('a','A') character set latin1 collate latin1_bin);

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `s` set('a','A') character set latin1 collate latin1_bin default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

insert into t1 values ('a'),('a,A'),('A,a'),('A');

select s from t1 order by s;

s

a

A

a,A

a,A

drop table t1;

CREATE TABLE t1 (c set('ae','oe','ue','ss') collate latin1_german2_ci);

INSERT INTO t1 VALUES (''),(''),(''),('');

INSERT INTO t1 VALUES ('ae'),('oe'),('ue'),('ss');

INSERT INTO t1 VALUES (',,,');

INSERT INTO t1 VALUES ('ae,oe,ue,ss');

SELECT c FROM t1 ORDER BY c;

c

ae

ae

oe

oe

ue

ue

ss

ss

ae,oe,ue,ss

ae,oe,ue,ss

DROP TABLE t1;

mysql-test/t/type_set.test

+21 −0
Original line number Diff line number Diff line
@@ -14,3 +14,24 @@ show create table t1; 
drop table t1;

CREATE TABLE t1 (   user varchar(64) NOT NULL default '',   path varchar(255) NOT NULL default '',   privilege   set('select','RESERVED30','RESERVED29','RESERVED28','RESERVED27','RESERVED26',   'RESERVED25','RESERVED24','data.delete','RESERVED22','RESERVED21',   'RESERVED20','data.insert.none','data.insert.approve',   'data.insert.delete','data.insert.move','data.insert.propose',   'data.insert.reject','RESERVED13','RESERVED12','RESERVED11','RESERVED10',   'RESERVED09','data.update','RESERVED07','RESERVED06','RESERVED05',   'RESERVED04','metadata.delete','metadata.put','RESERVED01','RESERVED00')   NOT NULL default '',   KEY user (user)   ) ENGINE=MyISAM CHARSET=utf8;

DROP TABLE t1;



#

# Check that SET is case sensitive with a binary collation

#

set names latin1;

create table t1 (s set ('a','A') character set latin1 collate latin1_bin);

show create table t1;

insert into t1 values ('a'),('a,A'),('A,a'),('A');

select s from t1 order by s;

drop table t1;



#

# Check that SET honors a more complex collation correctly

#

CREATE TABLE t1 (c set('ae','oe','ue','ss') collate latin1_german2_ci);

INSERT INTO t1 VALUES (''),(''),(''),('');

INSERT INTO t1 VALUES ('ae'),('oe'),('ue'),('ss');

INSERT INTO t1 VALUES (',,,');

INSERT INTO t1 VALUES ('ae,oe,ue,ss');

SELECT c FROM t1 ORDER BY c;

DROP TABLE t1;

sql/field.cc

+2 −2
Original line number Diff line number Diff line
@@ -5692,8 +5692,8 @@ int Field_set::store(const char *from,uint length,CHARSET_INFO *cs) 
    from= tmpstr.ptr();

    length=  tmpstr.length();

  }

  ulonglong tmp= find_set(typelib, from, length, &not_used, &not_used2,

			  &got_warning);

  ulonglong tmp= find_set(typelib, from, length, field_charset,

                          &not_used, &not_used2, &got_warning);

  if (!tmp && length && length < 22)

  {

    /* This is for reading numbers with LOAD DATA INFILE */

sql/mysql_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -809,7 +809,7 @@ extern void yyerror(const char*); 
extern bool check_reserved_words(LEX_STRING *name);



/* strfunc.cc */

ulonglong find_set(TYPELIB *typelib,const char *x, uint length,

ulonglong find_set(TYPELIB *lib, const char *x, uint length, CHARSET_INFO *cs,

		   char **err_pos, uint *err_len, bool *set_warning);

uint find_type(TYPELIB *lib, const char *find, uint length, bool part_match);

uint find_type2(TYPELIB *lib, const char *find, uint length, CHARSET_INFO *cs);

sql/set_var.cc

+3 −1
Original line number Diff line number Diff line
@@ -1460,7 +1460,9 @@ bool sys_var::check_set(THD *thd, set_var *var, TYPELIB *enum_names) 
      goto err;

    var->save_result.ulong_value= ((ulong)

				   find_set(enum_names, res->c_ptr(),

					    res->length(), &error, &error_len,

					    res->length(),

                                            NULL,

                                            &error, &error_len,

					    &not_used));

    if (error_len)

    {