Commit 33ccb2af 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-5.0


mysql-test/r/ndb_multi.result:
  Auto merged
parents eac99ea0 69374271

mysql-test/r/ndb_multi.result

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ show tables; 
Tables_in_test

t1

Warnings:

Warning	1050	Local table t1 shadows cluster table

Warning	1050	Local table test.t1 shadows ndb table

select * from t1 order by c1;

c1

100