Commit e0367223 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/opt/local/work/mysql-5.0-root
parents e69de4f6 2e79201c

mysql-test/r/ndb_alter_table.result

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ a b c 
2	two	two

alter table t1 drop index c;

select * from t1 where b = 'two';

ERROR HY000: Table definition has changed, please retry transaction

ERROR HY000: Can't lock file (errno: 241)

select * from t1 where b = 'two';

a	b	c

2	two	two

mysql-test/r/ndb_basic.result

+4 −4
Original line number Diff line number Diff line
@@ -667,13 +667,13 @@ counter datavalue 
57	newval

58	newval

drop table t1;

CREATE TABLE t1 ( b INT ) PACK_KEYS = 0 ENGINE = ndb;

select * from t1;

b

drop table t1;

create table atablewithareallylongandirritatingname (a int);

insert into atablewithareallylongandirritatingname values (2);

select * from atablewithareallylongandirritatingname;

a

2

drop table atablewithareallylongandirritatingname;
 
CREATE TABLE t1 ( b INT ) PACK_KEYS = 0 ENGINE = ndb;

select * from t1;

b

drop table t1;

mysql-test/r/ps.result

+19 −0
Original line number Diff line number Diff line
@@ -806,3 +806,22 @@ execute stmt; 
@@tx_isolation

REPEATABLE-READ

deallocate prepare stmt;

prepare stmt from "create temporary table t1 (letter enum('','a','b','c')

not null)";

execute stmt;

drop table t1;

execute stmt;

drop table t1;

execute stmt;

drop table t1;

set names latin1;

prepare stmt from "create table t1 (a enum('test') default 'test')

 character set utf8";

execute stmt;

drop table t1;

execute stmt;

drop table t1;

execute stmt;

drop table t1;

set names default;

deallocate prepare stmt;

mysql-test/r/select.result

+8 −0
Original line number Diff line number Diff line
@@ -2708,6 +2708,14 @@ select distinct count(f2) >0 from t1 left join t2 on f1=f3 group by f1; 
count(f2) >0

1

drop table t1,t2;

create table t1 (f1 int,f2 int);

insert into t1 values(1,1);

create table t2 (f3 int, f4 int, primary key(f3,f4));

insert into t2 values(1,1);

select * from t1 where f1 in (select f3 from t2 where (f3,f4)= (select f3,f4 from t2));

f1	f2

1	1

drop table t1,t2;

CREATE TABLE t1 ( city char(30) );

INSERT INTO t1 VALUES ('London');

INSERT INTO t1 VALUES ('Paris');

mysql-test/t/ndb_alter_table.test

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ connection server1; 
alter table t1 drop index c;

connection server2;

# This should fail since index information is not automatically refreshed

--error 1412

--error 1015

select * from t1 where b = 'two';

select * from t1 where b = 'two';

connection server1;