Commit df3156a3 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


mysql-test/t/ndb_multi.test:
  Auto merged
parents fb88fe5b 34edcac8

mysql-test/r/ndb_multi.result

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ c1 
1

3

5

show tables;

Tables_in_test

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

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

select * from t1 order by c1;

mysql-test/t/ndb_multi.test

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ insert into t1 values(1),(3),(5); 
select * from t1 order by c1;



connection server2;

show tables;

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

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

select * from t1 order by c1;