into mysql.com:/users/lthalmann/bkroot/mysql-5.0-release include/my_sys.h: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/log.cc: Auto merged