Merge bk@192.168.21.1:mysql-5.0-opt

into  mysql.com:/home/hf/work/embt/my50-embt

1 files changed, 2 insertions, 0 deletions

diff --git a/mysql-test/t/join.test b/mysql-test/t/join.test
index 4a07f495a55..ab85cc5bed2 100644
--- a/mysql-test/t/join.test
+++ b/mysql-test/t/join.test
@@ -520,6 +520,8 @@ select * from v1a join v1b on t1.b = t2.b;
 #
 # Bug #17523 natural join and information_schema
 #
+# We mask out the Privileges column because it differs with embedded server
+--replace_column 31 #
 select * from information_schema.statistics join information_schema.columns
               using(table_name,column_name) where table_name='user';