Commit d4f43011 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/home/bar/mysql-5.0.b21505 

into  mysql.com:/usr/home/bar/mysql-5.1.b21505


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents 69ac4dba 7614eb0d

mysql-test/r/ctype_utf8.result

+26 −0
Original line number Diff line number Diff line
@@ -1536,6 +1536,32 @@ set @a:=null; 
execute my_stmt using @a;

a	b

drop table if exists t1;

drop table if exists t1;

drop view if exists v1, v2;

set names utf8;

create table t1(col1 varchar(12) character set utf8 collate utf8_unicode_ci);

insert into t1 values('t1_val');

create view v1 as select 'v1_val' as col1;

select coercibility(col1), collation(col1) from v1;

coercibility(col1)	collation(col1)

4	utf8_general_ci

create view v2 as select col1 from v1 union select col1 from t1;

select coercibility(col1), collation(col1)from v2;

coercibility(col1)	collation(col1)

2	utf8_unicode_ci

2	utf8_unicode_ci

drop view v1, v2;

create view v1 as select 'v1_val' collate utf8_swedish_ci as col1;

select coercibility(col1), collation(col1) from v1;

coercibility(col1)	collation(col1)

0	utf8_swedish_ci

create view v2 as select col1 from v1 union select col1 from t1;

select coercibility(col1), collation(col1) from v2;

coercibility(col1)	collation(col1)

0	utf8_swedish_ci

0	utf8_swedish_ci

drop view v1, v2;

drop table t1;

CREATE TABLE t1 (

colA int(11) NOT NULL,

colB varchar(255) character set utf8 NOT NULL,

mysql-test/t/ctype_utf8.test

+24 −0
Original line number Diff line number Diff line
@@ -1229,6 +1229,30 @@ set @a:=null; 
execute my_stmt using @a;

drop table if exists t1;





#

# Bug#21505 Create view - illegal mix of collation for operation 'UNION'

#

--disable_warnings

drop table if exists t1;

drop view if exists v1, v2;

--enable_warnings

set names utf8;

create table t1(col1 varchar(12) character set utf8 collate utf8_unicode_ci);

insert into t1 values('t1_val');

create view v1 as select 'v1_val' as col1;

select coercibility(col1), collation(col1) from v1;

create view v2 as select col1 from v1 union select col1 from t1;

select coercibility(col1), collation(col1)from v2;

drop view v1, v2;

create view v1 as select 'v1_val' collate utf8_swedish_ci as col1;

select coercibility(col1), collation(col1) from v1;

create view v2 as select col1 from v1 union select col1 from t1;

select coercibility(col1), collation(col1) from v2;

drop view v1, v2;

drop table t1;





#

# Bug#19960: Inconsistent results when joining

# InnoDB tables using partial UTF8 indexes

sql/field.cc

+1 −0
Original line number Diff line number Diff line
@@ -1427,6 +1427,7 @@ Field_str::Field_str(char *ptr_arg,uint32 len_arg, uchar *null_ptr_arg, 
  field_charset=charset;

  if (charset->state & MY_CS_BINSORT)

    flags|=BINARY_FLAG;

  field_derivation= DERIVATION_IMPLICIT;

}

sql/field.h

+7 −0
Original line number Diff line number Diff line
@@ -351,6 +351,9 @@ class Field 
  virtual CHARSET_INFO *sort_charset(void) const { return charset(); }

  virtual bool has_charset(void) const { return FALSE; }

  virtual void set_charset(CHARSET_INFO *charset) { }

  virtual enum Derivation derivation(void) const

  { return DERIVATION_IMPLICIT; }

  virtual void set_derivation(enum Derivation derivation) { }

  bool set_warning(MYSQL_ERROR::enum_warning_level, unsigned int code,

                   int cuted_increment);

  bool check_int(const char *str, int length, const char *int_end,
@@ -446,6 +449,7 @@ class Field_num :public Field { 
class Field_str :public Field {

protected:

  CHARSET_INFO *field_charset;

  enum Derivation field_derivation;

public:

  Field_str(char *ptr_arg,uint32 len_arg, uchar *null_ptr_arg,

	    uchar null_bit_arg, utype unireg_check_arg,
@@ -459,6 +463,9 @@ class Field_str :public Field { 
  uint size_of() const { return sizeof(*this); }

  CHARSET_INFO *charset(void) const { return field_charset; }

  void set_charset(CHARSET_INFO *charset) { field_charset=charset; }

  enum Derivation derivation(void) const { return field_derivation; }

  virtual void set_derivation(enum Derivation derivation_arg)

  { field_derivation= derivation_arg; }

  bool binary() const { return field_charset == &my_charset_bin; }

  uint32 max_length() { return field_length; }

  friend class create_field;

sql/item.cc

+1 −1
Original line number Diff line number Diff line
@@ -1655,7 +1655,7 @@ void Item_field::set_field(Field *field_par) 
  db_name= field_par->table->s->db.str;

  alias_name_used= field_par->table->alias_name_used;

  unsigned_flag=test(field_par->flags & UNSIGNED_FLAG);

  collation.set(field_par->charset(), DERIVATION_IMPLICIT);

  collation.set(field_par->charset(), field_par->derivation());

  fixed= 1;

}