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

into mysql.com:/windows/Linux_space/MySQL/mysql-5.0

Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0
2cab656a · mskold/marty@mysql.com/linux.site · 9ff78327 · 41398499 · 2cab656a
Commit 2cab656a authored Sep 13, 2006 by mskold/marty@mysql.com/linux.site
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

mysql-test/r/ndb_multi.result mysql-test/r/ndb_multi.result +1 -1

No files found.
--- a/mysql-test/r/ndb_multi.result
+++ b/mysql-test/r/ndb_multi.result
@@ -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