sql/ha_ndbcluster.h:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_cache.h:
  Auto merged
sql/ha_ndbcluster.cc:
  SCCS merged