into mysql.com:/home/my/mysql-5.0 sql/ha_ndbcluster.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_union.cc: Manual merge (trivial)