From: Jon Olav Hauglid Date: August 17 2011 1:18pm Subject: bzr push into mysql-trunk branch (jon.hauglid:3316 to 3317) List-Archive: http://lists.mysql.com/commits/140681 Message-Id: <201108171318.p7HDIcvY029254@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3317 Jon Olav Hauglid 2011-08-17 [merge] Merge from mysql-trunk to mysql-trunk-wl2111-new added: client/mysql_plugin.c mysql-test/include/daemon_example_bad_format.ini mysql-test/include/daemon_example_bad_soname.ini mysql-test/r/mysql_plugin.result mysql-test/r/optimizer_bug12837084.result mysql-test/suite/innodb/r/innodb_bug59733.result mysql-test/suite/innodb/r/innodb_corrupt_bit.result mysql-test/suite/innodb/t/innodb_bug59733.test mysql-test/suite/innodb/t/innodb_corrupt_bit.test mysql-test/suite/perfschema/include/connection_cleanup.inc mysql-test/suite/perfschema/include/connection_load.inc mysql-test/suite/perfschema/include/connection_setup.inc mysql-test/suite/perfschema/include/no_protocol.inc mysql-test/suite/perfschema/include/wait_for_pfs_thread_count.inc mysql-test/suite/perfschema/r/connection.result mysql-test/suite/perfschema/r/connection_3a.result mysql-test/suite/perfschema/r/connection_3a_3u.result mysql-test/suite/perfschema/r/connection_3u.result mysql-test/suite/perfschema/r/ddl_accounts.result mysql-test/suite/perfschema/r/ddl_esgs_by_account_by_event_name.result mysql-test/suite/perfschema/r/ddl_esgs_by_host_by_event_name.result mysql-test/suite/perfschema/r/ddl_esgs_by_user_by_event_name.result mysql-test/suite/perfschema/r/ddl_esms_by_account_by_event_name.result mysql-test/suite/perfschema/r/ddl_esms_by_host_by_event_name.result mysql-test/suite/perfschema/r/ddl_esms_by_user_by_event_name.result mysql-test/suite/perfschema/r/ddl_ews_by_account_by_event_name.result mysql-test/suite/perfschema/r/ddl_ews_by_host_by_event_name.result mysql-test/suite/perfschema/r/ddl_ews_by_user_by_event_name.result mysql-test/suite/perfschema/r/ddl_hosts.result mysql-test/suite/perfschema/r/ddl_users.result mysql-test/suite/perfschema/r/dml_accounts.result mysql-test/suite/perfschema/r/dml_esgs_by_account_by_event_name.result mysql-test/suite/perfschema/r/dml_esgs_by_host_by_event_name.result mysql-test/suite/perfschema/r/dml_esgs_by_user_by_event_name.result mysql-test/suite/perfschema/r/dml_esms_by_account_by_event_name.result mysql-test/suite/perfschema/r/dml_esms_by_host_by_event_name.result mysql-test/suite/perfschema/r/dml_esms_by_user_by_event_name.result mysql-test/suite/perfschema/r/dml_ews_by_account_by_event_name.result mysql-test/suite/perfschema/r/dml_ews_by_host_by_event_name.result mysql-test/suite/perfschema/r/dml_ews_by_user_by_event_name.result mysql-test/suite/perfschema/r/dml_hosts.result mysql-test/suite/perfschema/r/dml_users.result mysql-test/suite/perfschema/r/event_aggregate_no_a.result mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result mysql-test/suite/perfschema/r/event_aggregate_no_h.result mysql-test/suite/perfschema/r/event_aggregate_no_u.result mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result mysql-test/suite/perfschema/r/start_server_no_account.result mysql-test/suite/perfschema/r/start_server_no_host.result mysql-test/suite/perfschema/r/start_server_no_user.result mysql-test/suite/perfschema/r/start_server_no_waits_history.result mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result mysql-test/suite/perfschema/t/connection.test mysql-test/suite/perfschema/t/connection_3a-master.opt mysql-test/suite/perfschema/t/connection_3a.test mysql-test/suite/perfschema/t/connection_3a_3u-master.opt mysql-test/suite/perfschema/t/connection_3a_3u.test mysql-test/suite/perfschema/t/connection_3u-master.opt mysql-test/suite/perfschema/t/connection_3u.test mysql-test/suite/perfschema/t/ddl_accounts.test mysql-test/suite/perfschema/t/ddl_esgs_by_account_by_event_name.test mysql-test/suite/perfschema/t/ddl_esgs_by_host_by_event_name.test mysql-test/suite/perfschema/t/ddl_esgs_by_user_by_event_name.test mysql-test/suite/perfschema/t/ddl_esms_by_account_by_event_name.test mysql-test/suite/perfschema/t/ddl_esms_by_host_by_event_name.test mysql-test/suite/perfschema/t/ddl_esms_by_user_by_event_name.test mysql-test/suite/perfschema/t/ddl_ews_by_account_by_event_name.test mysql-test/suite/perfschema/t/ddl_ews_by_host_by_event_name.test mysql-test/suite/perfschema/t/ddl_ews_by_user_by_event_name.test mysql-test/suite/perfschema/t/ddl_hosts.test mysql-test/suite/perfschema/t/ddl_users.test mysql-test/suite/perfschema/t/dml_accounts.test mysql-test/suite/perfschema/t/dml_esgs_by_account_by_event_name.test mysql-test/suite/perfschema/t/dml_esgs_by_host_by_event_name.test mysql-test/suite/perfschema/t/dml_esgs_by_user_by_event_name.test mysql-test/suite/perfschema/t/dml_esms_by_account_by_event_name.test mysql-test/suite/perfschema/t/dml_esms_by_host_by_event_name.test mysql-test/suite/perfschema/t/dml_esms_by_user_by_event_name.test mysql-test/suite/perfschema/t/dml_ews_by_account_by_event_name.test mysql-test/suite/perfschema/t/dml_ews_by_host_by_event_name.test mysql-test/suite/perfschema/t/dml_ews_by_user_by_event_name.test mysql-test/suite/perfschema/t/dml_hosts.test mysql-test/suite/perfschema/t/dml_users.test mysql-test/suite/perfschema/t/event_aggregate_no_a-master.opt mysql-test/suite/perfschema/t/event_aggregate_no_a.test mysql-test/suite/perfschema/t/event_aggregate_no_a_no_h-master.opt mysql-test/suite/perfschema/t/event_aggregate_no_a_no_h.test mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u-master.opt mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u.test mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u_no_h-master.opt mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u_no_h.test mysql-test/suite/perfschema/t/event_aggregate_no_h-master.opt mysql-test/suite/perfschema/t/event_aggregate_no_h.test mysql-test/suite/perfschema/t/event_aggregate_no_u-master.opt mysql-test/suite/perfschema/t/event_aggregate_no_u.test mysql-test/suite/perfschema/t/event_aggregate_no_u_no_h-master.opt mysql-test/suite/perfschema/t/event_aggregate_no_u_no_h.test mysql-test/suite/perfschema/t/start_server_no_account-master.opt mysql-test/suite/perfschema/t/start_server_no_account.test mysql-test/suite/perfschema/t/start_server_no_host-master.opt mysql-test/suite/perfschema/t/start_server_no_host.test mysql-test/suite/perfschema/t/start_server_no_user-master.opt mysql-test/suite/perfschema/t/start_server_no_user.test mysql-test/suite/perfschema/t/start_server_no_waits_history-master.opt mysql-test/suite/perfschema/t/start_server_no_waits_history.test mysql-test/suite/perfschema/t/start_server_no_waits_history_long-master.opt mysql-test/suite/perfschema/t/start_server_no_waits_history_long.test mysql-test/suite/sys_vars/r/innodb_file_format_max_basic.result mysql-test/suite/sys_vars/r/innodb_flush_neighbors_basic.result mysql-test/suite/sys_vars/r/innodb_force_load_corrupted_basic.result mysql-test/suite/sys_vars/r/innodb_large_prefix_basic.result mysql-test/suite/sys_vars/r/innodb_lru_scan_depth_basic.result mysql-test/suite/sys_vars/r/innodb_rollback_segments_basic.result mysql-test/suite/sys_vars/r/innodb_stats_method_basic.result mysql-test/suite/sys_vars/r/pfs_accounts_size_basic.result mysql-test/suite/sys_vars/r/pfs_hosts_size_basic.result mysql-test/suite/sys_vars/r/pfs_users_size_basic.result mysql-test/suite/sys_vars/t/innodb_buffer_pool_filename_basic-master.opt mysql-test/suite/sys_vars/t/innodb_file_format_max_basic.test mysql-test/suite/sys_vars/t/innodb_flush_neighbors_basic.test mysql-test/suite/sys_vars/t/innodb_force_load_corrupted_basic.test mysql-test/suite/sys_vars/t/innodb_large_prefix_basic.test mysql-test/suite/sys_vars/t/innodb_lru_scan_depth_basic.test mysql-test/suite/sys_vars/t/innodb_rollback_segments_basic.test mysql-test/suite/sys_vars/t/innodb_stats_method_basic.test mysql-test/suite/sys_vars/t/pfs_accounts_size_basic-master.opt mysql-test/suite/sys_vars/t/pfs_accounts_size_basic.test mysql-test/suite/sys_vars/t/pfs_hosts_size_basic-master.opt mysql-test/suite/sys_vars/t/pfs_hosts_size_basic.test mysql-test/suite/sys_vars/t/pfs_users_size_basic-master.opt mysql-test/suite/sys_vars/t/pfs_users_size_basic.test mysql-test/t/mysql_plugin-master.opt mysql-test/t/mysql_plugin.test mysql-test/t/optimizer_bug12837084.test plugin/daemon_example/daemon_example.ini storage/perfschema/cursor_by_account.cc storage/perfschema/cursor_by_account.h storage/perfschema/cursor_by_host.cc storage/perfschema/cursor_by_host.h storage/perfschema/cursor_by_thread.cc storage/perfschema/cursor_by_thread.h storage/perfschema/cursor_by_user.cc storage/perfschema/cursor_by_user.h storage/perfschema/pfs_account.cc storage/perfschema/pfs_account.h storage/perfschema/pfs_host.cc storage/perfschema/pfs_host.h storage/perfschema/pfs_user.cc storage/perfschema/pfs_user.h storage/perfschema/table_accounts.cc storage/perfschema/table_accounts.h storage/perfschema/table_esgs_by_account_by_event_name.cc storage/perfschema/table_esgs_by_account_by_event_name.h storage/perfschema/table_esgs_by_host_by_event_name.cc storage/perfschema/table_esgs_by_host_by_event_name.h storage/perfschema/table_esgs_by_user_by_event_name.cc storage/perfschema/table_esgs_by_user_by_event_name.h storage/perfschema/table_esms_by_account_by_event_name.cc storage/perfschema/table_esms_by_account_by_event_name.h storage/perfschema/table_esms_by_host_by_event_name.cc storage/perfschema/table_esms_by_host_by_event_name.h storage/perfschema/table_esms_by_user_by_event_name.cc storage/perfschema/table_esms_by_user_by_event_name.h storage/perfschema/table_ews_by_account_by_event_name.cc storage/perfschema/table_ews_by_account_by_event_name.h storage/perfschema/table_ews_by_host_by_event_name.cc storage/perfschema/table_ews_by_host_by_event_name.h storage/perfschema/table_ews_by_user_by_event_name.cc storage/perfschema/table_ews_by_user_by_event_name.h storage/perfschema/table_hosts.cc storage/perfschema/table_hosts.h storage/perfschema/table_users.cc storage/perfschema/table_users.h storage/perfschema/unittest/pfs_account-oom-t.cc storage/perfschema/unittest/pfs_host-oom-t.cc storage/perfschema/unittest/pfs_user-oom-t.cc modified: client/CMakeLists.txt client/readline.cc include/my_base.h include/my_global.h libmysqld/emb_qcache.cc libmysqld/lib_sql.cc mysql-test/collections/default.experimental mysql-test/include/icp_tests.inc mysql-test/include/join_cache.inc mysql-test/include/mrr_tests.inc mysql-test/include/plugin.defs mysql-test/include/range.inc mysql-test/include/subquery.inc mysql-test/mysql-test-run.pl mysql-test/r/derived.result mysql-test/r/explain.result mysql-test/r/func_gconcat.result mysql-test/r/func_str.result mysql-test/r/func_time.result mysql-test/r/get_diagnostics.result mysql-test/r/grant2.result mysql-test/r/group_by.result mysql-test/r/heap.result mysql-test/r/index_merge_myisam.result mysql-test/r/information_schema-big.result mysql-test/r/information_schema.result mysql-test/r/innodb_explain_non_select_none.result mysql-test/r/innodb_icp.result mysql-test/r/innodb_icp_all.result mysql-test/r/innodb_icp_none.result mysql-test/r/innodb_mrr.result mysql-test/r/innodb_mrr_all.result mysql-test/r/innodb_mrr_cost.result mysql-test/r/innodb_mrr_cost_all.result mysql-test/r/innodb_mrr_cost_icp.result mysql-test/r/innodb_mrr_icp.result mysql-test/r/innodb_mrr_none.result mysql-test/r/join_cache_jcl0.result mysql-test/r/join_cache_jcl1.result mysql-test/r/join_cache_jcl2.result mysql-test/r/join_cache_jcl3.result mysql-test/r/join_cache_jcl4.result mysql-test/r/join_cache_jcl5.result mysql-test/r/join_cache_jcl6.result mysql-test/r/join_cache_jcl7.result mysql-test/r/join_cache_jcl8.result mysql-test/r/myisam_explain_non_select_none.result mysql-test/r/myisam_icp.result mysql-test/r/myisam_icp_all.result mysql-test/r/myisam_icp_none.result mysql-test/r/myisam_mrr.result mysql-test/r/myisam_mrr_all.result mysql-test/r/myisam_mrr_cost.result mysql-test/r/myisam_mrr_cost_all.result mysql-test/r/myisam_mrr_cost_icp.result mysql-test/r/myisam_mrr_icp.result mysql-test/r/myisam_mrr_none.result mysql-test/r/mysql_binary_mode.result mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.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/row.result mysql-test/r/signal.result mysql-test/r/signal_demo3.result mysql-test/r/sp-big.result mysql-test/r/sp-bugs.result mysql-test/r/sp-code.result mysql-test/r/sp-error.result mysql-test/r/sp.result mysql-test/r/sp_trans.result mysql-test/r/strict.result mysql-test/r/subquery_all.result mysql-test/r/subquery_nomat_nosj.result mysql-test/r/subquery_none.result mysql-test/r/view.result mysql-test/suite/engines/funcs/r/sf_alter.result mysql-test/suite/engines/funcs/r/sf_cursor.result mysql-test/suite/engines/funcs/r/sp_alter.result mysql-test/suite/engines/funcs/r/sp_cursor.result mysql-test/suite/funcs_1/datadict/datadict_priv.inc mysql-test/suite/funcs_1/r/innodb_storedproc_02.result mysql-test/suite/funcs_1/r/memory_storedproc_02.result mysql-test/suite/funcs_1/r/myisam_storedproc_02.result mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result mysql-test/suite/funcs_1/r/processlist_priv_ps.result mysql-test/suite/funcs_1/r/storedproc.result mysql-test/suite/innodb/r/innodb-analyze.result mysql-test/suite/innodb/r/innodb-zip.result mysql-test/suite/innodb/r/innodb_monitor.result mysql-test/suite/innodb/r/innodb_mysql.result mysql-test/suite/innodb/t/innodb-analyze.test mysql-test/suite/innodb/t/innodb-zip.test mysql-test/suite/innodb/t/innodb_buffer_pool_load-master.opt mysql-test/suite/opt_trace/include/general2.inc mysql-test/suite/opt_trace/r/bugs_no_prot_none.result mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result mysql-test/suite/opt_trace/r/charset.result mysql-test/suite/opt_trace/r/general2_no_prot.result mysql-test/suite/opt_trace/r/general2_ps_prot.result mysql-test/suite/opt_trace/r/general_no_prot_none.result mysql-test/suite/opt_trace/r/general_ps_prot_none.result mysql-test/suite/opt_trace/r/range_no_prot.result mysql-test/suite/opt_trace/r/range_ps_prot.result mysql-test/suite/opt_trace/r/security_no_prot.result mysql-test/suite/opt_trace/r/security_ps_prot.result mysql-test/suite/perfschema/include/event_aggregate_cleanup.inc mysql-test/suite/perfschema/include/event_aggregate_load.inc mysql-test/suite/perfschema/include/event_aggregate_setup.inc mysql-test/suite/perfschema/include/schema.inc mysql-test/suite/perfschema/include/stage_setup.inc mysql-test/suite/perfschema/include/start_server_common.inc mysql-test/suite/perfschema/include/table_aggregate_cleanup.inc mysql-test/suite/perfschema/include/table_aggregate_load.inc mysql-test/suite/perfschema/include/table_aggregate_setup.inc mysql-test/suite/perfschema/include/table_io_setup_helper.inc mysql-test/suite/perfschema/r/checksum.result mysql-test/suite/perfschema/r/csv_table_io.result mysql-test/suite/perfschema/r/event_aggregate.result mysql-test/suite/perfschema/r/indexed_table_io.result mysql-test/suite/perfschema/r/information_schema.result mysql-test/suite/perfschema/r/innodb_table_io.result mysql-test/suite/perfschema/r/memory_table_io.result mysql-test/suite/perfschema/r/merge_table_io.result mysql-test/suite/perfschema/r/multi_table_io.result mysql-test/suite/perfschema/r/myisam_file_io.result mysql-test/suite/perfschema/r/myisam_table_io.result mysql-test/suite/perfschema/r/ortho_iter.result mysql-test/suite/perfschema/r/part_table_io.result mysql-test/suite/perfschema/r/pfs_upgrade.result mysql-test/suite/perfschema/r/privilege_table_io.result mysql-test/suite/perfschema/r/rollback_table_io.result mysql-test/suite/perfschema/r/schema.result mysql-test/suite/perfschema/r/setup_objects.result mysql-test/suite/perfschema/r/start_server_innodb.result mysql-test/suite/perfschema/r/start_server_no_cond_class.result mysql-test/suite/perfschema/r/start_server_no_cond_inst.result mysql-test/suite/perfschema/r/start_server_no_file_class.result mysql-test/suite/perfschema/r/start_server_no_file_inst.result mysql-test/suite/perfschema/r/start_server_no_mutex_class.result mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result mysql-test/suite/perfschema/r/start_server_no_setup_actors.result mysql-test/suite/perfschema/r/start_server_no_setup_objects.result mysql-test/suite/perfschema/r/start_server_no_stage_class.result mysql-test/suite/perfschema/r/start_server_no_stages_history.result mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result mysql-test/suite/perfschema/r/start_server_no_statement_class.result mysql-test/suite/perfschema/r/start_server_no_statements_history.result mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result mysql-test/suite/perfschema/r/start_server_no_table_hdl.result mysql-test/suite/perfschema/r/start_server_no_table_inst.result mysql-test/suite/perfschema/r/start_server_no_thread_class.result mysql-test/suite/perfschema/r/start_server_no_thread_inst.result mysql-test/suite/perfschema/r/start_server_nothing.result mysql-test/suite/perfschema/r/start_server_off.result mysql-test/suite/perfschema/r/start_server_on.result mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result mysql-test/suite/perfschema/r/table_aggregate_off.result mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result mysql-test/suite/perfschema/r/table_schema.result mysql-test/suite/perfschema/r/temp_table_io.result mysql-test/suite/perfschema/r/trigger_table_io.result mysql-test/suite/perfschema/r/view_table_io.result mysql-test/suite/perfschema/t/checksum.test mysql-test/suite/perfschema/t/setup_objects.test mysql-test/suite/perfschema/t/start_server_nothing-master.opt mysql-test/suite/perfschema/t/start_server_nothing.test mysql-test/suite/rpl/r/rpl_heartbeat.result mysql-test/suite/rpl/r/rpl_row_sp005.result mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result mysql-test/suite/rpl/t/rpl_heartbeat.test mysql-test/suite/sys_vars/r/all_vars.result mysql-test/suite/sys_vars/r/innodb_buffer_pool_filename_basic.result mysql-test/suite/sys_vars/r/innodb_file_format_check_basic.result mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result mysql-test/suite/sys_vars/r/innodb_stats_sample_pages_basic.result mysql-test/suite/sys_vars/t/all_vars.test mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_basic.test mysql-test/suite/sys_vars/t/innodb_buffer_pool_filename_basic.test mysql-test/suite/sys_vars/t/innodb_fast_shutdown_basic.test mysql-test/suite/sys_vars/t/innodb_file_format_check_basic.test mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test mysql-test/suite/sys_vars/t/innodb_io_capacity_basic.test mysql-test/suite/sys_vars/t/innodb_lock_wait_timeout_basic.test mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_basic.test mysql-test/t/derived.test mysql-test/t/func_str.test mysql-test/t/func_time.test mysql-test/t/grant2.test mysql-test/t/group_by.test mysql-test/t/heap.test mysql-test/t/information_schema.test mysql-test/t/join.test mysql-test/t/mysql_binary_mode.test mysql-test/t/sp-error.test mysql-test/t/sp.test mysql-test/t/sp_trans.test mysys/my_handler_errors.h mysys/my_init.c mysys/my_thr_init.c mysys/mysys_priv.h plugin/daemon_example/CMakeLists.txt scripts/mysql_system_tables.sql sql/authors.h sql/binlog.cc sql/debug_sync.cc sql/event_data_objects.cc sql/event_db_repository.cc sql/event_parse_data.cc sql/event_scheduler.cc sql/field.cc sql/field.h sql/field_conv.cc sql/ha_ndbcluster.cc sql/ha_ndbcluster_binlog.cc sql/ha_ndbcluster_cond.cc sql/handler.cc sql/handler.h sql/item.cc sql/item_cmpfunc.cc sql/item_cmpfunc.h sql/item_func.cc sql/item_geofunc.cc sql/item_strfunc.cc sql/item_subselect.cc sql/item_sum.cc sql/item_timefunc.cc sql/item_xmlfunc.cc sql/key.h sql/log.cc sql/log_event.cc sql/my_decimal.cc sql/mysqld.cc sql/opt_explain.cc sql/opt_range.cc sql/opt_range.h sql/opt_sum.cc sql/partition_info.cc sql/protocol.cc sql/records.cc sql/records.h sql/rpl_info_file.cc sql/rpl_record.cc sql/rpl_reporting.cc sql/rpl_rli.cc sql/rpl_slave.cc sql/set_var.cc sql/share/errmsg-utf8.txt sql/sp.cc sql/sp_head.cc sql/sp_head.h sql/sp_pcontext.cc sql/sp_pcontext.h sql/sp_rcontext.cc sql/sp_rcontext.h sql/sql_acl.cc sql/sql_admin.cc sql/sql_alloc_error_handler.cc sql/sql_alter.cc sql/sql_audit.h sql/sql_base.cc sql/sql_base.h sql/sql_class.cc sql/sql_class.h sql/sql_cursor.cc sql/sql_db.cc sql/sql_derived.cc sql/sql_derived.h sql/sql_error.cc sql/sql_error.h sql/sql_get_diagnostics.cc sql/sql_get_diagnostics.h sql/sql_handler.cc sql/sql_insert.cc sql/sql_join_cache.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_list.h sql/sql_load.cc sql/sql_locale.cc sql/sql_parse.cc sql/sql_partition.cc sql/sql_plugin.cc sql/sql_prepare.cc sql/sql_prepare.h sql/sql_priv.h sql/sql_select.cc sql/sql_select.h sql/sql_servers.cc sql/sql_show.cc sql/sql_signal.cc sql/sql_signal.h sql/sql_table.cc sql/sql_table.h sql/sql_tablespace.cc sql/sql_test.cc sql/sql_time.cc sql/sql_time.h sql/sql_trigger.cc sql/sql_union.cc sql/sql_update.cc sql/sql_view.cc sql/sql_yacc.yy sql/structs.h sql/sys_vars.cc sql/table.cc sql/table.h sql/unireg.cc storage/heap/hp_hash.c storage/innobase/btr/btr0btr.c storage/innobase/btr/btr0cur.c storage/innobase/btr/btr0pcur.c storage/innobase/btr/btr0sea.c storage/innobase/buf/buf0buf.c storage/innobase/buf/buf0flu.c storage/innobase/buf/buf0lru.c storage/innobase/buf/buf0rea.c storage/innobase/dict/dict0crea.c storage/innobase/dict/dict0dict.c storage/innobase/dict/dict0load.c storage/innobase/handler/ha_innodb.cc storage/innobase/handler/handler0alter.cc storage/innobase/handler/i_s.cc storage/innobase/ibuf/ibuf0ibuf.c storage/innobase/include/btr0btr.h storage/innobase/include/btr0btr.ic storage/innobase/include/buf0buf.h storage/innobase/include/buf0buf.ic storage/innobase/include/buf0flu.h storage/innobase/include/buf0lru.h storage/innobase/include/buf0types.h storage/innobase/include/db0err.h storage/innobase/include/dict0boot.h storage/innobase/include/dict0dict.h storage/innobase/include/dict0dict.ic storage/innobase/include/dict0mem.h storage/innobase/include/dict0priv.ic storage/innobase/include/dict0types.h storage/innobase/include/ibuf0ibuf.ic storage/innobase/include/srv0mon.h storage/innobase/include/srv0srv.h storage/innobase/include/sync0sync.h storage/innobase/include/trx0sys.h storage/innobase/log/log0log.c storage/innobase/pars/pars0opt.c storage/innobase/read/read0read.c storage/innobase/row/row0ins.c storage/innobase/row/row0merge.c storage/innobase/row/row0mysql.c storage/innobase/row/row0purge.c storage/innobase/row/row0sel.c storage/innobase/row/row0uins.c storage/innobase/row/row0umod.c storage/innobase/row/row0upd.c storage/innobase/srv/srv0mon.c storage/innobase/srv/srv0srv.c storage/innobase/sync/sync0sync.c storage/innobase/trx/trx0sys.c storage/innobase/ut/ut0ut.c storage/perfschema/CMakeLists.txt storage/perfschema/ha_perfschema.cc storage/perfschema/pfs.cc storage/perfschema/pfs_engine_table.cc storage/perfschema/pfs_events_stages.cc storage/perfschema/pfs_events_stages.h storage/perfschema/pfs_events_statements.cc storage/perfschema/pfs_events_statements.h storage/perfschema/pfs_events_waits.cc storage/perfschema/pfs_events_waits.h storage/perfschema/pfs_instr.cc storage/perfschema/pfs_instr.h storage/perfschema/pfs_instr_class.cc storage/perfschema/pfs_instr_class.h storage/perfschema/pfs_server.cc storage/perfschema/pfs_server.h storage/perfschema/pfs_setup_actor.cc storage/perfschema/pfs_setup_object.cc storage/perfschema/pfs_stat.h storage/perfschema/pfs_visitor.cc storage/perfschema/pfs_visitor.h storage/perfschema/table_esgs_global_by_event_name.cc storage/perfschema/table_esms_global_by_event_name.cc storage/perfschema/table_helper.cc storage/perfschema/table_helper.h storage/perfschema/table_threads.cc storage/perfschema/table_threads.h storage/perfschema/unittest/CMakeLists.txt storage/perfschema/unittest/pfs-t.cc storage/perfschema/unittest/pfs_instr-oom-t.cc storage/perfschema/unittest/pfs_instr-t.cc storage/perfschema/unittest/pfs_instr_class-oom-t.cc storage/perfschema/unittest/stub_pfs_global.h support-files/mysql.spec.sh unittest/gunit/get_diagnostics-t.cc unittest/gunit/sql_list-t.cc unittest/gunit/test_utils.cc unittest/gunit/test_utils.h 3316 Davi Arnaut 2011-07-29 WL#2111: #10 Use default collation utf8_general_ci Since MySQL's default collation for the UTF8 character set is utf8_general_ci, also use it as the default collation for the UTF8 string-based diagnostics items. @ mysql-test/t/get_diagnostics.test Print the default character set, collation and collation coercibility of some of the UTF8 string-base items. @ sql/sql_get_diagnostics.cc The destination character set is UTF8 with utf8_general_ci collation. modified: mysql-test/r/get_diagnostics.result mysql-test/t/get_diagnostics.test sql/sql_get_diagnostics.cc Diff too large for email (143752 lines, the limit is 10000). No bundle (reason: useless for push emails).