sql/handler.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/ha_ndbcluster.h:
  SCCS merged