sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_list.h:
  Auto merged
support-files/my-huge.cnf.sh:
  Added query_cache_size
support-files/my-large.cnf.sh:
  Added query_cache_size