Commit 842fd992 authored by unknown's avatar unknown
Browse files

Merge abarkov@bk-internal:/home/bk/mysql-5.0 

into  mysql.com:/usr/home/bar/mysql-5.0.b9278


mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/cast.result:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
parents 99ed3437 60e411eb

include/m_ctype.h

+1 −0
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ typedef struct charset_info_st 
  uint      mbmaxlen;

  uint16    min_sort_char;

  uint16    max_sort_char; /* For LIKE optimization */

  uchar     pad_char;

  my_bool   escape_with_backslash_is_dangerous;

  

  MY_CHARSET_HANDLER *cset;

mysql-test/r/alter_table.result

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ alter table t1 change a a char(10) character set cp1251; 
select a,hex(a) from t1;

a	hex(a)

	F2E5F1F2

alter table t1 change a a binary(10);

alter table t1 change a a binary(4);

select a,hex(a) from t1;

a	hex(a)

	F2E5F1F2

mysql-test/r/binary.result

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ NULL 
select b from t1 having binary b like '';

b

drop table t1;

create table t1 (a char(15) binary, b binary(15));

create table t1 (a char(3) binary, b binary(3));

insert into t1 values ('aaa','bbb'),('AAA','BBB');

select upper(a),upper(b) from t1;

upper(a)	upper(b)

mysql-test/r/cast.result

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ t1 CREATE TABLE `t1` ( 
  `c5` varchar(2) character set utf8 NOT NULL default ''

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

create table t1 (a binary(10), b char(10) character set koi8r);

create table t1 (a binary(4), b char(4) character set koi8r);

insert into t1 values (_binary'',_binary'');

select a,b,cast(a as char character set cp1251),cast(b as binary) from t1;

a	b	cast(a as char character set cp1251)	cast(b as binary)

mysql-test/r/ctype_cp1251.result

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ a 
b

c

drop table t1;

create table t1 (a char(15) binary, b binary(15)) character set cp1251;

create table t1 (a char(3) binary, b binary(3)) character set cp1251;

insert into t1 values ('aaa','bbb'),('AAA','BBB');

select upper(a),upper(b) from t1;

upper(a)	upper(b)