Commit 62af392e authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt


mysql-test/r/view.result:
  Auto merged
parents a8d8ebed 0073d9be

mysql-test/lib/mtr_misc.pl

+8 −1
Original line number Diff line number Diff line
@@ -82,9 +82,16 @@ sub mtr_path_exists (@) { 


sub mtr_script_exists (@) {

  foreach my $path ( @_ )

  {

    if($::glob_win32)

    {

      return $path if -f $path;

    }

    else

    {

      return $path if -x $path;

    }

  }

  if ( @_ == 1 )

  {

    mtr_error("Could not find $_[0]");

mysql-test/r/ctype_cp1250_ch.result

+8 −0
Original line number Diff line number Diff line
@@ -43,3 +43,11 @@ id str 
6	aaaaaa

7	aaaaaaa

drop table t1;

set names cp1250;

create table t1 (a varchar(15) collate cp1250_czech_cs NOT NULL, primary key(a));

insert into t1 values("abcdefgh");

insert into t1 values("");

select a from t1 where a like "abcdefgh";

a

abcdefgh

drop table t1;

mysql-test/r/ctype_utf8.result

+16 −0
Original line number Diff line number Diff line
@@ -1281,6 +1281,22 @@ id tid val 
42749	72	VOLN ADSL

44205	72	VOLN ADSL

DROP TABLE t1;

create table t1(a char(200) collate utf8_unicode_ci NOT NULL default '')

default charset=utf8 collate=utf8_unicode_ci;

insert into t1 values (unhex('65')), (unhex('C3A9')), (unhex('65'));

explain select distinct a from t1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using temporary

select distinct a from t1;

a

e

explain select a from t1 group by a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using temporary; Using filesort

select a from t1 group by a;

a

e

drop table t1;

CREATE TABLE t1(id varchar(20) NOT NULL) DEFAULT CHARSET=utf8;

INSERT INTO t1 VALUES ('xxx'), ('aa'), ('yyy'), ('aa');

SELECT id FROM t1;

mysql-test/r/federated.result

+27 −1
Original line number Diff line number Diff line
@@ -1788,7 +1788,33 @@ length(a) 
5000

drop table t1;

drop table t1;

End of 5.0 tests

DROP TABLE IF EXISTS federated.test;

CREATE TABLE federated.test (

`i` int(11) NOT NULL,

`j` int(11) NOT NULL,

`c` varchar(30) default NULL,

PRIMARY KEY  (`i`,`j`),

UNIQUE KEY `i` (`i`,`c`)

) ENGINE=InnoDB DEFAULT CHARSET=latin1;

DROP TABLE IF EXISTS federated.test1;

DROP TABLE IF EXISTS federated.test2;

create table federated.test1 (

i int not null,

j int not null,

c varchar(30),

primary key (i,j),

unique key (i, c))

engine = federated

connection='mysql://root@127.0.0.1:SLAVE_PORT/federated/test';

create table federated.test2 (

i int default null,

j int not null,

c varchar(30),

key (i))

engine = federated

connection='mysql://root@127.0.0.1:SLAVE_PORT/federated/test';

drop table federated.test1, federated.test2;

drop table federated.test;

DROP TABLE IF EXISTS federated.t1;

DROP DATABASE IF EXISTS federated;

DROP TABLE IF EXISTS federated.t1;

mysql-test/r/federated_transactions.result

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ CREATE TABLE federated.t1 ( 
`id` int(20) NOT NULL,

`name` varchar(32) NOT NULL default ''

    )

DEFAULT CHARSET=latin1 ENGINE=InnoDB;

DEFAULT CHARSET=latin1 ENGINE=innodb;

DROP TABLE IF EXISTS federated.t1;

Warnings:

Note	1051	Unknown table 't1'