bzr push into mysql-trunk branch (annamalai.gurusami:5273 to 5274)

[Annamalai Gurusami]

 5274 Annamalai Gurusami	2012-12-18 [merge]
      Null merge from mysql-5.6 to mysql-5.7.

 5273 Jon Olav Hauglid	2012-12-18
      Bug#15997345: REMOVE WITH_CSV_STORAGE_ENGINE AND
                    WITH_MYISAMMRG_STORAGE_ENGINE IFDEFS
      
      This patch removes #ifdef WITH_MYISAMMRG_STORAGE_ENGINE
      and #ifdef WITH_CSV_STORAGE_ENGINE
      
      Building with -DWITH_MYISAMMRG_STORAGE_ENGINE=0
      -DWITH_CSV_STORAGE_ENGINE=0 had no effect since these
      plugins are declared as mandatory. The #ifdefs are
      therefore pointless.

    removed:
      mysql-test/include/have_csv.inc
    modified:
      config.h.cmake
      mysql-test/suite/funcs_1/t/is_engines_csv.test
      mysql-test/suite/large_tests/t/rpl_slave_net_timeout.test
      mysql-test/suite/perfschema/r/pfs_upgrade_event.result
      mysql-test/suite/perfschema/r/pfs_upgrade_func.result
      mysql-test/suite/perfschema/r/pfs_upgrade_proc.result
      mysql-test/suite/perfschema/r/pfs_upgrade_table.result
      mysql-test/suite/perfschema/r/pfs_upgrade_view.result
      mysql-test/suite/stress/t/ddl_csv.test
      mysql-test/t/connect.test
      mysql-test/t/csv.test
      mysql-test/t/csv_alter_table.test
      mysql-test/t/csv_not_null.test
      mysql-test/t/information_schema-big.test
      mysql-test/t/information_schema.test
      mysql-test/t/log_state.test
      mysql-test/t/log_tables-big.test
      mysql-test/t/log_tables.test
      mysql-test/t/log_tables_upgrade.test
      mysql-test/t/mysqlcheck.test
      mysql-test/t/partition_csv.test
      mysql-test/t/show_check.test
      mysql-test/t/system_mysql_db.test
      scripts/mysql_system_tables.sql
      sql/mysqld.cc
      sql/set_var.h
      sql/sql_cache.cc
No bundle (reason: useless for push emails).