bzr push into mysql-trunk branch (mayank.prasad:4341 to 4342) WL#6372

[Mayank Prasad]

 4342 Mayank Prasad	2012-08-30
      wl#6372 : Post-Iris changes to Server defaults
                                          
      Details:
       - Fixing MTR Test cases part5.

    modified:
      mysql-test/r/mysqld--help-win.result
      mysql-test/suite/rpl/t/rpl_corruption-master.opt
 4341 Mayank Prasad	2012-08-29
       wl#6372 : Post-Iris changes to Server defaults
                                    
      Details:
       - Fixing MTR Test cases part4.

    added:
      mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_allow-master.opt
      mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_allow-master.opt
      mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_allow-master.opt
      mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_allow-master.opt
      mysql-test/suite/perfschema/t/hostcache_ipv4_blocked-master.opt
      mysql-test/suite/perfschema/t/hostcache_ipv4_max_con-master.opt
      mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_deny-master.opt
      mysql-test/suite/perfschema/t/hostcache_ipv4_ssl-master.opt
      mysql-test/suite/perfschema/t/stage_mdl_global-master.opt
    modified:
      mysql-test/include/default_mysqld_autosize.cnf
      mysql-test/suite/perfschema/t/event_aggregate_no_u-master.opt
      mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny-master.opt
      mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow-master.opt
      mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny-master.opt
      mysql-test/suite/perfschema/t/hostcache_ipv6_max_con-master.opt
      mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny-master.opt
      mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny-master.opt
      mysql-test/suite/perfschema/t/hostcache_ipv6_ssl-master.opt
      mysql-test/suite/perfschema/t/threads_mysql-master.opt
      mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result
=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result	revid:mayank.prasad@stripped
+++ b/mysql-test/r/mysqld--help-win.result	revid:mayank.prasad@stripped
@@ -1033,7 +1033,7 @@ general-log FALSE
 group-concat-max-len 1024
 gtid-mode OFF
 help TRUE
-host-cache-size 128
+host-cache-size 279
 ignore-builtin-innodb FALSE
 init-connect 
 init-file (No default value)
@@ -1177,8 +1177,8 @@ profiling-history-size 15
 query-alloc-block-size 8192
 query-cache-limit 1048576
 query-cache-min-res-unit 4096
-query-cache-size 0
-query-cache-type ON
+query-cache-size 1048576
+query-cache-type OFF
 query-cache-wlock-invalidate FALSE
 query-prealloc-size 8192
 range-alloc-block-size 4096
@@ -1227,7 +1227,7 @@ slave-type-conversions
 slow-launch-time 2
 slow-query-log FALSE
 slow-start-timeout 15000
-sort-buffer-size 262144
+sort-buffer-size 32768
 sporadic-binlog-dump-fail FALSE
 sql-mode NO_ENGINE_SUBSTITUTION
 stored-program-cache 256
@@ -1242,7 +1242,7 @@ table-definition-cache 400
 table-open-cache 400
 table-open-cache-instances 1
 tc-heuristic-recover COMMIT
-thread-cache-size 0
+thread-cache-size 9
 thread-handling one-thread-per-connection
 thread-stack 262144
 time-format %H:%i:%s

=== modified file 'mysql-test/suite/rpl/t/rpl_corruption-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_corruption-master.opt	revid:mayank.prasad@stripped
+++ b/mysql-test/suite/rpl/t/rpl_corruption-master.opt	revid:mayank.prasad@stripped
@@ -1 +1,2 @@
 --binlog-checksum=CRC32 --master-verify-checksum=1
+--thread_cache_size=0

No bundle (reason: useless for push emails).