Commit 5bd9bf55 authored by unknown's avatar unknown
Browse files

Merge maint2.mysql.com:/data/localhome/tsmith/bk/41 

into  maint2.mysql.com:/data/localhome/tsmith/bk/50


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
vio/viosocket.c:
  Auto merged
client/mysql.cc:
  Manual merge.
mysql-test/t/ctype_recoding.test:
  Manual merge.
sql/sql_lex.h:
  SCCS merged
sql/sql_table.cc:
  Manual merge.
mysql-test/r/ctype_recoding.result:
  Manual merge
parents 5992281d 5576ed8b

client/mysql.cc

+7 −2
Original line number Diff line number Diff line
@@ -2354,7 +2354,12 @@ print_table_data(MYSQL_RES *result) 
    (void) tee_fputs("|", PAGER);

    for (uint off=0; (field = mysql_fetch_field(result)) ; off++)

    {

      tee_fprintf(PAGER, " %-*s |",(int) min(field->max_length,

      uint name_length= (uint) strlen(field->name);

      uint numcells= charset_info->cset->numcells(charset_info,

                                                  field->name,

                                                  field->name + name_length);

      uint display_length= field->max_length + name_length - numcells;

      tee_fprintf(PAGER, " %-*s |",(int) min(display_length,

                                            MAX_COLUMN_LENGTH),

                  field->name);

      num_flag[off]= IS_NUM(field->type);

mysql-test/r/ctype_recoding.result

+11 −0
Original line number Diff line number Diff line
@@ -248,3 +248,14 @@ select rpad(c1,3,' 
rpad(c1,3,'')	rpad('',3,c1)

	

drop table t1;

set names koi8r;

create table t1(a char character set cp1251 default _koi8r 0xFF);

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` char(1) character set cp1251 default ''

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

create table t1(a char character set latin1 default _cp1251 0xFF);

ERROR 42000: Invalid default value for 'a'

End of 4.1 tests

mysql-test/r/ctype_utf8.result

+31 −0
Original line number Diff line number Diff line
@@ -924,6 +924,37 @@ NULL 
select ifnull(NULL, _utf8'string');

ifnull(NULL, _utf8'string')

string

set names utf8;

create table t1 (s1 char(5) character set utf8 collate utf8_lithuanian_ci);

insert into t1 values ('I'),('K'),('Y');

select * from t1 where s1 < 'K' and s1 = 'Y';

s1

I

Y

select * from t1 where 'K' > s1 and s1 = 'Y';

s1

I

Y

drop table t1;

create table t1 (s1 char(5) character set utf8 collate utf8_czech_ci);

insert into t1 values ('c'),('d'),('h'),('ch'),('CH'),('cH'),('Ch'),('i');

select * from t1 where s1 > 'd' and s1 = 'CH';

s1

ch

CH

Ch

select * from t1 where 'd' < s1 and s1 = 'CH';

s1

ch

CH

Ch

select * from t1 where s1 = 'cH' and s1 <> 'ch';

s1

cH

select * from t1 where 'cH' = s1 and s1 <> 'ch';

s1

cH

drop table t1;

create table t1 (a varchar(255)) default character set utf8;

insert into t1 values (1.0);

drop table t1;

mysql-test/t/ctype_recoding.test

+13 −1
Original line number Diff line number Diff line
@@ -187,4 +187,16 @@ select rpad(c1,3,' 
#select case c1 when '' then '' when '' then '' else 'c' end from t1;

#select export_set(5,c1,''), export_set(5,'',c1) from t1;

drop table t1;

# End of 4.1 tests
 
 

#

# Bug 20695: problem with field default value's character set

#



set names koi8r;

create table t1(a char character set cp1251 default _koi8r 0xFF);

show create table t1;

drop table t1;

--error 1067

create table t1(a char character set latin1 default _cp1251 0xFF);



--echo End of 4.1 tests

mysql-test/t/ctype_utf8.test

+18 −0
Original line number Diff line number Diff line
@@ -727,6 +727,24 @@ drop table t1; 
select repeat(_utf8'+',3) as h union select NULL;

select ifnull(NULL, _utf8'string');



#

# Bug#9509 Optimizer: wrong result after AND with comparisons

#

set names utf8;

create table t1 (s1 char(5) character set utf8 collate utf8_lithuanian_ci);

insert into t1 values ('I'),('K'),('Y');

select * from t1 where s1 < 'K' and s1 = 'Y';

select * from t1 where 'K' > s1 and s1 = 'Y';

drop table t1;



create table t1 (s1 char(5) character set utf8 collate utf8_czech_ci);

insert into t1 values ('c'),('d'),('h'),('ch'),('CH'),('cH'),('Ch'),('i');

select * from t1 where s1 > 'd' and s1 = 'CH';

select * from t1 where 'd' < s1 and s1 = 'CH';

select * from t1 where s1 = 'cH' and s1 <> 'ch';

select * from t1 where 'cH' = s1 and s1 <> 'ch';

drop table t1;



#

# Bug#10714: Inserting double value into utf8 column crashes server

#