into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work-25530


BUILD/SETUP.sh:
  Auto merged
configure.in:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged