Commit 364cda0a authored by unknown's avatar unknown
Browse files

Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 

into  mysql.com:/windows/Linux_space/MySQL/mysql-4.1-ndb


mysql-test/r/ndb_update.result:
  Auto merged
parents e1295481 e4cc40f8

mysql-test/r/ndb_charset.result

+2 −2
Original line number Diff line number Diff line
@@ -78,9 +78,9 @@ unique key(a) 
) engine=ndb;

insert into t1 values(1, 'aAa');

insert into t1 values(2, 'aaa');

ERROR 23000: Duplicate entry '2' for key 1

ERROR 23000: Duplicate entry '' for key 0

insert into t1 values(3, 'AAA');

ERROR 23000: Duplicate entry '3' for key 1

ERROR 23000: Duplicate entry '' for key 0

select * from t1 order by p;

p	a

1	aAa

mysql-test/r/ndb_index_unique.result

+5 −5
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ select * from t1 where b = 4 order by a; 
a	b	c

3	4	6

insert into t1 values(8, 2, 3);

ERROR 23000: Duplicate entry '8' for key 1

ERROR 23000: Duplicate entry '' for key 0

select * from t1 order by a;

a	b	c

1	2	3
@@ -89,7 +89,7 @@ a b c 
1	1	1

4	4	NULL

insert into t1 values(5,1,1);

ERROR 23000: Duplicate entry '5' for key 1

ERROR 23000: Duplicate entry '' for key 0

drop table t1;

CREATE TABLE t2 (

a int unsigned NOT NULL PRIMARY KEY,
@@ -112,7 +112,7 @@ select * from t2 where b = 4 order by a; 
a	b	c

3	4	6

insert into t2 values(8, 2, 3);

ERROR 23000: Duplicate entry '8' for key 1

ERROR 23000: Duplicate entry '' for key 0

select * from t2 order by a;

a	b	c

1	2	3
@@ -177,7 +177,7 @@ pk a 
3	NULL

4	4

insert into t1 values (5,0);

ERROR 23000: Duplicate entry '5' for key 1

ERROR 23000: Duplicate entry '' for key 0

select * from t1 order by pk;

pk	a

-1	NULL
@@ -210,7 +210,7 @@ pk a b c 
0	NULL	18	NULL

1	3	19	abc

insert into t2 values(2,3,19,'abc');

ERROR 23000: Duplicate entry '2' for key 1

ERROR 23000: Duplicate entry '' for key 0

select * from t2 order by pk;

pk	a	b	c

-1	1	17	NULL

mysql-test/r/ndb_multi.result

+32 −0
Original line number Diff line number Diff line
@@ -69,3 +69,35 @@ t3 
t4

drop table t1, t2, t3, t4;

drop table t1, t3, t4;

create table t1(c1 int key)ENGINE=MyISAM;

insert into t1 values(1),(3),(5);

select * from t1 order by c1;

c1

1

3

5

create table t1(c1 int key)ENGINE=MyISAM;

insert into t1 values(100),(344),(533);

select * from t1 order by c1;

c1

100

344

533

alter table t1 engine=ndb;

show tables;

Tables_in_test

t1

Warnings:

Warning	1050	Local table test.t1 shadows ndb table

select * from t1 order by c1;

c1

100

344

533

drop table t1;

select * from t1 order by c1;

c1

1

3

5

drop table t1;

mysql-test/r/ndb_update.result

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ pk1 b c 
2	2	2

4	1	1

UPDATE t1 set pk1 = 1, c = 2 where pk1 = 4;

ERROR 23000: Duplicate entry '1' for key 1

ERROR 23000: Duplicate entry '' for key 0

select * from t1 order by pk1;

pk1	b	c

0	0	0

mysql-test/t/ndb_multi.test

+22 −0
Original line number Diff line number Diff line
@@ -69,4 +69,26 @@ drop table t1, t2, t3, t4; 
connection server2;

drop table t1, t3, t4;



# bug#21378

connection server1;

create table t1(c1 int key)ENGINE=MyISAM;

insert into t1 values(1),(3),(5);

select * from t1 order by c1;



connection server2;

create table t1(c1 int key)ENGINE=MyISAM;

insert into t1 values(100),(344),(533);

select * from t1 order by c1;



connection server1;

alter table t1 engine=ndb;



connection server2;

show tables;

select * from t1 order by c1;

drop table t1;



connection server1;

select * from t1 order by c1;

drop table t1;

# End of 4.1 tests