From: Christopher Powers
Date: June 1 2012 3:53am
Subject: bzr push into mysql-trunk branch (chris.powers:3939)
List-Archive: http://lists.mysql.com/commits/144068
Message-Id: <201206010353.q513rdfb007610@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3939 Christopher Powers	2012-05-31 [merge]
      local merge with mysql-trunk

    added:
      mysql-test/suite/innodb/r/innodb_stats_auto_recalc.result
      mysql-test/suite/innodb/r/innodb_stats_auto_recalc_ddl.result
      mysql-test/suite/innodb/r/innodb_stats_auto_recalc_lots.result
      mysql-test/suite/innodb/r/innodb_stats_auto_recalc_on_nonexistent.result
      mysql-test/suite/innodb/r/innodb_stats_sample_pages.result
      mysql-test/suite/innodb/r/innodb_stats_table_flag_auto_recalc.result
      mysql-test/suite/innodb/r/innodb_stats_table_flag_sample_pages.result
      mysql-test/suite/innodb/t/innodb_stats_auto_recalc.test
      mysql-test/suite/innodb/t/innodb_stats_auto_recalc_ddl.test
      mysql-test/suite/innodb/t/innodb_stats_auto_recalc_lots.test
      mysql-test/suite/innodb/t/innodb_stats_auto_recalc_on_nonexistent.test
      mysql-test/suite/innodb/t/innodb_stats_sample_pages.test
      mysql-test/suite/innodb/t/innodb_stats_table_flag_auto_recalc.test
      mysql-test/suite/innodb/t/innodb_stats_table_flag_sample_pages.test
      mysql-test/suite/sys_vars/r/innodb_stats_auto_recalc_basic.result
      mysql-test/suite/sys_vars/t/innodb_stats_auto_recalc_basic.test
      storage/innobase/dict/dict0stats_background.cc
      storage/innobase/include/dict0stats_background.h
    modified:
      mysql-test/include/ctype_utf8mb4.inc
      mysql-test/include/explain_non_select.inc
      mysql-test/include/icp_tests.inc
      mysql-test/include/join_cache.inc
      mysql-test/include/mix1.inc
      mysql-test/include/mix2.inc
      mysql-test/include/mrr_tests.inc
      mysql-test/include/range.inc
      mysql-test/include/rowid_order.inc
      mysql-test/include/subquery.inc
      mysql-test/include/subquery_sj.inc
      mysql-test/include/subquery_sj_innodb.inc
      mysql-test/include/varchar.inc
      mysql-test/r/endspace.result
      mysql-test/r/func_analyse.result
      mysql-test/r/func_group_innodb_16k.result
      mysql-test/r/group_min_max_innodb.result
      mysql-test/r/innodb_icp.result
      mysql-test/r/innodb_icp_all.result
      mysql-test/r/innodb_icp_none.result
      mysql-test/r/join_outer_innodb.result
      mysql-test/r/mix2_myisam.result
      mysql-test/r/myisam.result
      mysql-test/r/myisam_icp.result
      mysql-test/r/myisam_icp_all.result
      mysql-test/r/myisam_icp_none.result
      mysql-test/r/partition_explicit_prune.result
      mysql-test/r/range_all.result
      mysql-test/r/range_icp.result
      mysql-test/r/range_icp_mrr.result
      mysql-test/r/range_mrr.result
      mysql-test/r/range_mrr_cost.result
      mysql-test/r/range_none.result
      mysql-test/r/subselect_innodb.result
      mysql-test/r/type_bit_innodb.result
      mysql-test/r/type_time.result
      mysql-test/suite/innodb/r/innodb-index-online.result
      mysql-test/suite/innodb/r/innodb-index.result
      mysql-test/suite/innodb/r/innodb-zip.result
      mysql-test/suite/innodb/r/innodb.result
      mysql-test/suite/innodb/r/innodb_16k.result
      mysql-test/suite/innodb/r/innodb_bug-13628249.result
      mysql-test/suite/innodb/r/innodb_bug60049.result
      mysql-test/suite/innodb/r/innodb_lock_wait_timeout_1.result
      mysql-test/suite/innodb/r/innodb_monitor.result
      mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/suite/innodb/r/innodb_stats_create_table.result
      mysql-test/suite/innodb/t/innodb-index-online.test
      mysql-test/suite/innodb/t/innodb-index.test
      mysql-test/suite/innodb/t/innodb-zip.test
      mysql-test/suite/innodb/t/innodb.test
      mysql-test/suite/innodb/t/innodb_16k.test
      mysql-test/suite/innodb/t/innodb_bug-13628249.test
      mysql-test/suite/innodb/t/innodb_bug57252.test
      mysql-test/suite/innodb/t/innodb_bug60049.test
      mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test
      mysql-test/suite/innodb/t/innodb_monitor.test
      mysql-test/suite/innodb/t/innodb_mysql.test
      mysql-test/suite/innodb/t/innodb_stats_create_table.test
      mysql-test/suite/innodb_fts/r/fulltext.result
      mysql-test/suite/innodb_fts/r/fulltext_cache.result
      mysql-test/suite/innodb_fts/r/fulltext_left_join.result
      mysql-test/suite/innodb_fts/r/fulltext_multi.result
      mysql-test/suite/innodb_fts/r/fulltext_order_by.result
      mysql-test/suite/innodb_fts/r/innodb-fts-basic.result
      mysql-test/suite/innodb_fts/r/innodb-fts-ddl.result
      mysql-test/suite/innodb_fts/r/innodb-fts-fic.result
      mysql-test/suite/innodb_fts/r/innodb-fts-stopword.result
      mysql-test/suite/innodb_fts/r/innodb_fts_misc.result
      mysql-test/suite/innodb_fts/r/innodb_fts_misc_1.result
      mysql-test/suite/innodb_fts/r/innodb_fts_mutiple_index.result
      mysql-test/suite/innodb_fts/r/innodb_fts_opt.result
      mysql-test/suite/innodb_fts/r/innodb_fts_transaction.result
      mysql-test/suite/innodb_fts/t/fulltext.test
      mysql-test/suite/innodb_fts/t/fulltext_cache.test
      mysql-test/suite/innodb_fts/t/fulltext_left_join.test
      mysql-test/suite/innodb_fts/t/fulltext_multi.test
      mysql-test/suite/innodb_fts/t/fulltext_order_by.test
      mysql-test/suite/innodb_fts/t/innodb-fts-basic.test
      mysql-test/suite/innodb_fts/t/innodb-fts-ddl.test
      mysql-test/suite/innodb_fts/t/innodb-fts-fic.test
      mysql-test/suite/innodb_fts/t/innodb-fts-stopword.test
      mysql-test/suite/innodb_fts/t/innodb_fts_misc.test
      mysql-test/suite/innodb_fts/t/innodb_fts_misc_1.test
      mysql-test/suite/innodb_fts/t/innodb_fts_mutiple_index.test
      mysql-test/suite/innodb_fts/t/innodb_fts_opt.test
      mysql-test/suite/innodb_fts/t/innodb_fts_transaction.test
      mysql-test/suite/opt_trace/include/range.inc
      mysql-test/suite/opt_trace/r/range_no_prot.result
      mysql-test/suite/opt_trace/r/range_ps_prot.result
      mysql-test/suite/parts/inc/partition_check_read1.inc
      mysql-test/suite/parts/inc/partition_check_read2.inc
      mysql-test/suite/parts/inc/partition_exchange.inc
      mysql-test/suite/parts/inc/partition_mgm.inc
      mysql-test/suite/parts/r/partition_debug_sync_innodb.result
      mysql-test/suite/parts/t/partition_debug_sync_innodb.test
      mysql-test/suite/perfschema/r/digest_table_full.result
      mysql-test/suite/perfschema/r/statement_digest.result
      mysql-test/suite/perfschema/r/statement_digest_consumers.result
      mysql-test/suite/perfschema/r/statement_digest_long_query.result
      mysql-test/suite/rpl/t/disabled.def
      mysql-test/suite/sys_vars/r/innodb_monitor_disable_basic.result
      mysql-test/suite/sys_vars/r/innodb_monitor_enable_basic.result
      mysql-test/suite/sys_vars/r/innodb_monitor_reset_all_basic.result
      mysql-test/suite/sys_vars/r/innodb_monitor_reset_basic.result
      mysql-test/suite/sys_vars/r/innodb_stats_persistent_basic.result
      mysql-test/suite/sys_vars/t/innodb_monitor_disable_basic.test
      mysql-test/suite/sys_vars/t/innodb_monitor_enable_basic.test
      mysql-test/suite/sys_vars/t/innodb_monitor_reset_all_basic.test
      mysql-test/suite/sys_vars/t/innodb_monitor_reset_basic.test
      mysql-test/t/ctype_utf8.test
      mysql-test/t/endspace.test
      mysql-test/t/func_analyse.test
      mysql-test/t/func_group_innodb_16k.test
      mysql-test/t/group_min_max_innodb.test
      mysql-test/t/join_outer_innodb.test
      mysql-test/t/partition_explicit_prune.test
      mysql-test/t/subquery_sj_firstmatch.test
      mysql-test/t/subselect_innodb.test
      mysql-test/t/type_bit_innodb.test
      mysql-test/t/type_time.test
      scripts/mysql_system_tables.sql
      sql/handler.h
      sql/lex.h
      sql/sql_optimizer.cc
      sql/sql_show.cc
      sql/sql_table.cc
      sql/sql_yacc.yy
      sql/table.cc
      sql/table.h
      storage/innobase/CMakeLists.txt
      storage/innobase/dict/dict0dict.cc
      storage/innobase/dict/dict0stats.cc
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/ha_innodb.h
      storage/innobase/handler/handler0alter.cc
      storage/innobase/include/dict0mem.h
      storage/innobase/include/dict0stats.h
      storage/innobase/include/dict0stats.ic
      storage/innobase/include/srv0srv.h
      storage/innobase/row/row0ins.cc
      storage/innobase/row/row0mysql.cc
      storage/innobase/srv/srv0srv.cc
      storage/innobase/srv/srv0start.cc
=== modified file 'storage/perfschema/unittest/pfs-t.cc'
--- a/storage/perfschema/unittest/pfs-t.cc	2012-05-15 17:07:19 +0000
+++ b/storage/perfschema/unittest/pfs-t.cc	2012-06-01 03:42:14 +0000
@@ -111,6 +111,7 @@ void test_bootstrap()
   param.m_events_statements_history_sizing= 0;
   param.m_events_statements_history_long_sizing= 0;
   param.m_digest_sizing= 0;
+  param.m_session_connect_attrs_sizing= 0;
 
   boot= initialize_performance_schema(& param);
   ok(boot != NULL, "boot");
@@ -168,6 +169,7 @@ PSI * load_perfschema()
   param.m_events_statements_history_sizing= 0;
   param.m_events_statements_history_long_sizing= 0;
   param.m_digest_sizing= 0;
+  param.m_session_connect_attrs_sizing= 0;
 
   /* test_bootstrap() covered this, assuming it just works */
   boot= initialize_performance_schema(& param);
@@ -1511,6 +1513,7 @@ void test_event_name_index()
   param.m_events_statements_history_sizing= 0;
   param.m_events_statements_history_long_sizing= 0;
   param.m_digest_sizing= 0;
+  param.m_session_connect_attrs_sizing= 0;
 
   param.m_mutex_sizing= 0;
   param.m_rwlock_sizing= 0;

=== modified file 'storage/perfschema/unittest/pfs_instr-t.cc'
--- a/storage/perfschema/unittest/pfs_instr-t.cc	2011-08-11 03:11:58 +0000
+++ b/storage/perfschema/unittest/pfs_instr-t.cc	2012-06-01 03:42:14 +0000
@@ -60,6 +60,8 @@ void test_no_instruments()
   param.m_statement_class_sizing= 0;
   param.m_events_statements_history_sizing= 0;
   param.m_events_statements_history_long_sizing= 0;
+  param.m_digest_sizing= 0;
+  param.m_session_connect_attrs_sizing= 0;
 
   init_event_name_sizing(& param);
   rc= init_instruments(& param);
@@ -117,6 +119,8 @@ void test_no_instances()
   param.m_statement_class_sizing= 0;
   param.m_events_statements_history_sizing= 0;
   param.m_events_statements_history_long_sizing= 0;
+  param.m_digest_sizing= 0;
+  param.m_session_connect_attrs_sizing= 0;
 
   init_event_name_sizing(& param);
   rc= init_instruments(& param);
@@ -255,6 +259,8 @@ void test_with_instances()
   param.m_statement_class_sizing= 0;
   param.m_events_statements_history_sizing= 0;
   param.m_events_statements_history_long_sizing= 0;
+  param.m_digest_sizing= 0;
+  param.m_session_connect_attrs_sizing= 0;
 
   init_event_name_sizing(& param);
   rc= init_instruments(& param);

No bundle (reason: useless for push emails).