Commit 35f9ecc1 authored by unknown's avatar unknown
Browse files

merged on pull 


mysql-test/r/rpl_start_stop_slave.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/type_enum.result:
  merged test cases
mysql-test/t/type_enum.test:
  merged test cases
parents 646deed9 93cf297f

mysql-test/r/type_enum.result

+12 −0
Original line number Diff line number Diff line
@@ -1725,3 +1725,15 @@ a 




drop table t1;

create table t1 (a enum ('Y','N') CHARACTER SET utf8 COLLATE utf8_bin);

insert into t1 values ('Y');

alter table t1 add b set ('Y','N') CHARACTER SET utf8 COLLATE utf8_bin;

alter table t1 add c enum ('Y','N') CHARACTER SET utf8 COLLATE utf8_bin;

select * from t1;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def	test	t1	t1	a	a	254	3	1	Y	384	0	8

def	test	t1	t1	b	b	254	9	0	Y	2176	0	8

def	test	t1	t1	c	c	254	3	0	Y	384	0	8

a	b	c

Y	NULL	NULL

drop table t1;

mysql-test/t/ps.test

+0 −1
Original line number Diff line number Diff line
@@ -471,4 +471,3 @@ execute stmt using @var, @var, @var; 
set @var=null;

select @var is null, @var is not null, @var;

execute stmt using @var, @var, @var;

mysql-test/t/type_enum.test

+13 −0
Original line number Diff line number Diff line
@@ -100,3 +100,16 @@ set names latin1; 
show create table t1;

select a from t1 order by a;

drop table t1;



#

# Test bug where enum fields where extended for each ALTER TABLE

#



create table t1 (a enum ('Y','N') CHARACTER SET utf8 COLLATE utf8_bin);

insert into t1 values ('Y');

alter table t1 add b set ('Y','N') CHARACTER SET utf8 COLLATE utf8_bin;

alter table t1 add c enum ('Y','N') CHARACTER SET utf8 COLLATE utf8_bin;

--enable_metadata

select * from t1;

--disable metadata

drop table t1;

sql/field.cc

+42 −18
Original line number Diff line number Diff line
@@ -5842,8 +5842,7 @@ bool Field_num::eq_def(Field *field) 


void create_field::create_length_to_internal_length(void)

{

  switch (sql_type)

  {

  switch (sql_type) {

  case MYSQL_TYPE_TINY_BLOB:

  case MYSQL_TYPE_MEDIUM_BLOB:

  case MYSQL_TYPE_LONG_BLOB:
@@ -5854,10 +5853,33 @@ void create_field::create_length_to_internal_length(void) 
    pack_length= calc_pack_length(sql_type == FIELD_TYPE_VAR_STRING ?

                                  FIELD_TYPE_STRING : sql_type, length);

    break;

#ifdef CORRECT_CODE_BUT_CANT_YET_BE_USED

  case MYSQL_TYPE_ENUM:

  case MYSQL_TYPE_SET:

    length*= charset->mbmaxlen;

    break;

#else

    /*

      Because of a bug in MySQL 4.1 where length was extended for ENUM and SET

      fields for every ALTER TABLE, we have to recalculate lengths here

    */

  case MYSQL_TYPE_ENUM:

  {

    uint32 tot_length, max_length;

    calculate_interval_lengths(current_thd, interval,

                               &max_length, &tot_length);

    length= max_length * charset->mbmaxlen;

    break;

  }

  case MYSQL_TYPE_SET:

  {

    uint32 tot_length, max_length;

    calculate_interval_lengths(current_thd, interval,

                               &max_length, &tot_length);

    length= (tot_length + (interval->count - 1)) * charset->mbmaxlen;

    break;

  }

#endif

  default:

    /* do nothing */

    break;
@@ -6085,6 +6107,8 @@ create_field::create_field(Field *old_field,Field *orig_field) 
      }

      length=(length+charset->mbmaxlen-1)/charset->mbmaxlen; // QQ: Probably not needed

      break;

    case MYSQL_TYPE_ENUM:

    case MYSQL_TYPE_SET:

    case FIELD_TYPE_STRING:

    case FIELD_TYPE_VAR_STRING:

      length=(length+charset->mbmaxlen-1)/charset->mbmaxlen;

sql/item_cmpfunc.cc

+6 −6
Original line number Diff line number Diff line
@@ -2365,10 +2365,10 @@ Item_func_regex::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) 
    }

    int error;

    if ((error= regcomp(&preg,res->c_ptr(),

                        ((cmp_collation.collation->state & MY_CS_BINSORT) ||

                         (cmp_collation.collation->state & MY_CS_CSSORT)) ?

                        ((cmp_collation.collation->state &

                          (MY_CS_BINSORT | MY_CS_CSSORT)) ?

                         REG_EXTENDED | REG_NOSUB :

                         REG_EXTENDED | REG_NOSUB | REG_ICASE,

                         REG_EXTENDED | REG_NOSUB | REG_ICASE),

                        cmp_collation.collation)))

    {

      (void) regerror(error,&preg,buff,sizeof(buff));
@@ -2417,10 +2417,10 @@ longlong Item_func_regex::val_int() 
	regex_compiled=0;

      }

      if (regcomp(&preg,res2->c_ptr(),

                  ((cmp_collation.collation->state & MY_CS_BINSORT) ||

                   (cmp_collation.collation->state & MY_CS_CSSORT)) ?

                  ((cmp_collation.collation->state &

                    (MY_CS_BINSORT | MY_CS_CSSORT)) ?

                   REG_EXTENDED | REG_NOSUB :

                   REG_EXTENDED | REG_NOSUB | REG_ICASE,

                   REG_EXTENDED | REG_NOSUB | REG_ICASE),

                   cmp_collation.collation))

      {

	null_value=1;