sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Removed this change, it will be modified later anyway