From: Marc Alff Date: March 16 2011 9:33am Subject: bzr push into mysql-trunk branch (marc.alff:3257 to 3258) List-Archive: http://lists.mysql.com/commits/133114 Message-Id: <201103160933.p2G9XOR9007982@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3258 Marc Alff 2011-03-16 Build cleanup modified: include/mysql/psi/mysql_socket.h mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result mysql-test/suite/perfschema/r/schema_lc2.result 3257 Marc Alff 2011-03-16 [merge] Merge mysql-trunk --> mysql-trunk-wl4896 removed: mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile-slave.opt added: mysql-test/r/ssl_cipher.result mysql-test/suite/binlog/r/binlog_incident_ignore.result mysql-test/suite/binlog/t/binlog_incident_ignore-master.opt mysql-test/suite/binlog/t/binlog_incident_ignore.test mysql-test/suite/rpl/r/rpl_skip_incident.result mysql-test/suite/rpl/t/rpl_skip_incident-master.opt mysql-test/suite/rpl/t/rpl_skip_incident-slave.opt mysql-test/suite/rpl/t/rpl_skip_incident.test mysql-test/suite/sys_vars/r/max_long_data_size_basic.result mysql-test/suite/sys_vars/t/max_long_data_size_basic.test mysql-test/t/ssl_cipher-master.opt mysql-test/t/ssl_cipher.test renamed: regex/tests => regex/tests_include.h modified: client/mysqltest.cc extra/yassl/src/yassl_int.cpp mysql-test/collections/default.daily mysql-test/collections/default.push mysql-test/extra/binlog_tests/binlog.test mysql-test/extra/binlog_tests/database.test mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test mysql-test/extra/rpl_tests/rpl_conflicts.test mysql-test/extra/rpl_tests/rpl_extra_col_master.test mysql-test/extra/rpl_tests/rpl_extra_col_slave.test mysql-test/extra/rpl_tests/rpl_loaddata.test mysql-test/extra/rpl_tests/rpl_row_basic.test mysql-test/extra/rpl_tests/rpl_row_empty_imgs.test mysql-test/extra/rpl_tests/rpl_row_tabledefs.test mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test mysql-test/extra/rpl_tests/rpl_stop_middle_group.test mysql-test/include/mtr_warnings.sql mysql-test/include/wait_for_status_var.inc mysql-test/lib/My/Find.pm mysql-test/lib/mtr_cases.pm mysql-test/lib/mtr_report.pm mysql-test/mysql-test-run.pl mysql-test/r/archive_plugin.result mysql-test/r/blackhole_plugin.result mysql-test/r/flush_read_lock.result mysql-test/r/func_analyse.result mysql-test/r/information_schema.result mysql-test/r/information_schema_parameters.result mysql-test/r/information_schema_routines.result mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/r/mysqltest.result mysql-test/r/system_mysql_db.result mysql-test/r/variables.result mysql-test/suite/binlog/r/binlog_base64_flag.result mysql-test/suite/binlog/r/binlog_database.result mysql-test/suite/binlog/r/binlog_row_binlog.result mysql-test/suite/binlog/r/binlog_stm_binlog.result mysql-test/suite/binlog/t/binlog_base64_flag.test mysql-test/suite/funcs_1/r/is_columns_is.result mysql-test/suite/funcs_1/r/is_columns_mysql.result mysql-test/suite/funcs_1/r/is_routines.result mysql-test/suite/perfschema/r/relaylog.result mysql-test/suite/perfschema/t/relaylog.test mysql-test/suite/rpl/r/rpl_binlog_corruption.result mysql-test/suite/rpl/r/rpl_bug33931.result mysql-test/suite/rpl/r/rpl_checksum.result mysql-test/suite/rpl/r/rpl_checksum_cache.result mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result mysql-test/suite/rpl/r/rpl_corruption.result mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result mysql-test/suite/rpl/r/rpl_heartbeat_basic.result mysql-test/suite/rpl/r/rpl_idempotency.result mysql-test/suite/rpl/r/rpl_ignore_table.result mysql-test/suite/rpl/r/rpl_incident.result mysql-test/suite/rpl/r/rpl_init_slave_errors.result mysql-test/suite/rpl/r/rpl_known_bugs_detection.result mysql-test/suite/rpl/r/rpl_loaddata.result mysql-test/suite/rpl/r/rpl_loaddata_fatal.result mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_rotate_logs.result mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_row_colSize.result mysql-test/suite/rpl/r/rpl_row_conflicts.result mysql-test/suite/rpl/r/rpl_row_idempotency.result mysql-test/suite/rpl/r/rpl_row_img_eng_full.result mysql-test/suite/rpl/r/rpl_row_img_sanity.result mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result mysql-test/suite/rpl/r/rpl_show_errors.result mysql-test/suite/rpl/r/rpl_skip_error.result mysql-test/suite/rpl/r/rpl_slave_grp_exec.result mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result mysql-test/suite/rpl/r/rpl_slave_start.result mysql-test/suite/rpl/r/rpl_slow_query_log.result mysql-test/suite/rpl/r/rpl_stm_EE_err2.result mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_stm_conflicts.result mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result mysql-test/suite/rpl/r/rpl_stop_slave.result mysql-test/suite/rpl/r/rpl_temporary_errors.result mysql-test/suite/rpl/r/rpl_typeconv.result mysql-test/suite/rpl/t/rpl_binlog_corruption.test mysql-test/suite/rpl/t/rpl_bug33931.test mysql-test/suite/rpl/t/rpl_checksum.test mysql-test/suite/rpl/t/rpl_checksum_cache.test mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test mysql-test/suite/rpl/t/rpl_corruption.test mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test mysql-test/suite/rpl/t/rpl_heartbeat_basic.test mysql-test/suite/rpl/t/rpl_idempotency.test mysql-test/suite/rpl/t/rpl_ignore_table.test mysql-test/suite/rpl/t/rpl_incident.test mysql-test/suite/rpl/t/rpl_init_slave_errors.test mysql-test/suite/rpl/t/rpl_known_bugs_detection.test mysql-test/suite/rpl/t/rpl_loaddata_fatal.test mysql-test/suite/rpl/t/rpl_rotate_logs.test mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test mysql-test/suite/rpl/t/rpl_row_colSize.test mysql-test/suite/rpl/t/rpl_row_idempotency.test mysql-test/suite/rpl/t/rpl_row_img_sanity.test mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test mysql-test/suite/rpl/t/rpl_show_errors.test mysql-test/suite/rpl/t/rpl_skip_error.test mysql-test/suite/rpl/t/rpl_slave_grp_exec.test mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test mysql-test/suite/rpl/t/rpl_slave_start.test mysql-test/suite/rpl/t/rpl_slow_query_log.test mysql-test/suite/rpl/t/rpl_stm_start_stop_slave.test mysql-test/suite/rpl/t/rpl_stop_slave.test mysql-test/suite/rpl/t/rpl_temporary_errors.test mysql-test/suite/rpl/t/rpl_typeconv.test mysql-test/t/archive_plugin.test mysql-test/t/blackhole_plugin.test mysql-test/t/file_contents.test mysql-test/t/flush_read_lock.test mysql-test/t/func_analyse.test mysql-test/t/information_schema.test mysql-test/t/mysqlbinlog_raw_mode.test mysql-test/t/mysqltest.test mysql-test/t/partition_mgm_err2.test mysql-test/t/repair.test mysql-test/t/show_check.test mysql-test/t/variables.test regex/CMakeLists.txt regex/main.c scripts/mysql_system_tables.sql scripts/mysql_system_tables_fix.sql sql/binlog.cc sql/item.cc sql/log_event.cc sql/log_event.h sql/mysqld.cc sql/mysqld.h sql/rpl_slave.cc sql/sql_analyse.cc sql/sql_db.cc sql/sql_prepare.cc sql/sql_show.cc sql/sys_vars.cc strings/uca-dump.c tests/mysql_client_test.c unittest/mysys/my_vsnprintf-t.c regex/tests_include.h === modified file 'include/mysql/psi/mysql_socket.h' --- a/include/mysql/psi/mysql_socket.h 2011-03-14 16:11:25 +0000 +++ b/include/mysql/psi/mysql_socket.h 2011-03-16 09:32:27 +0000 @@ -342,7 +342,6 @@ inline_mysql_end_socket_wait(struct PSI_ #define mysql_socket_sendmsg(FD, M, FL) #define mysql_socket_recvmsg(FD, M, FL) #define mysql_socket_sockatmark(FD) - #define mysql_socket_isfdtype(FD, FT) #define mysql_socket_socketpair(K, D, T, P, FDS) #else @@ -372,14 +371,6 @@ inline_mysql_end_socket_wait(struct PSI_ #endif #ifdef HAVE_PSI_INTERFACE - #define mysql_socket_isfdtype(FD, FT) \ - inline_mysql_socket_isfdtype(__FILE__, __LINE__, FD, FT) - #else - #define mysql_socket_isfdtype(FD, FT) \ - inline_mysql_socket_isfdtype(FD, FT) - #endif - - #ifdef HAVE_PSI_INTERFACE #define mysql_socket_socketpair(K, D, T, P, FDS) \ inline_mysql_socket_socketpair(K, D, T, P, FDS) #else @@ -1027,38 +1018,6 @@ inline_mysql_socket_sockatmark return result; } -/** mysql_socket_isfdtype */ - -static inline int -inline_mysql_socket_isfdtype -( -#ifdef HAVE_PSI_INTERFACE - const char *src_file, uint src_line, -#endif - MYSQL_SOCKET mysql_socket, int fdtype) -{ - int result; -#ifdef HAVE_PSI_INTERFACE - struct PSI_socket_locker *locker= NULL; - PSI_socket_locker_state state; - - if (likely(PSI_server != NULL && mysql_socket.m_psi != NULL)) - { - locker= PSI_server->get_thread_socket_locker(&state, mysql_socket.m_psi, PSI_SOCKET_STAT); - if (likely(locker !=NULL)) - PSI_server->start_socket_wait(locker, (size_t)0, src_file, src_line); - } -#endif - - result= isfdtype(mysql_socket.fd, fdtype); - -#ifdef HAVE_PSI_INTERFACE - if (likely(locker != NULL)) - PSI_server->end_socket_wait(locker, (size_t)0); -#endif - return result; -} - /** mysql_socket_socketpair */ static inline int === modified file 'mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result' --- a/mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result 2011-02-22 02:58:40 +0000 +++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result 2011-03-16 09:32:27 +0000 @@ -18,20 +18,23 @@ ERROR 1050 (42S01) at line 177: Table 'e ERROR 1050 (42S01) at line 186: Table 'file_instances' already exists ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 218: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 232: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 242: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 252: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 261: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 269: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 278: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 288: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 296: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 341: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 484: Table 'threads' already exists -ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line 288: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line 353: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 362: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 376: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 386: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 396: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 405: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 413: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 422: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 432: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 440: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 485: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 529: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 608: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 628: Table 'threads' already exists +ERROR 1644 (HY000) at line 1048: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed show tables like "user_table"; Tables_in_performance_schema (user_table) @@ -54,20 +57,23 @@ ERROR 1050 (42S01) at line 177: Table 'e ERROR 1050 (42S01) at line 186: Table 'file_instances' already exists ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 218: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 232: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 242: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 252: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 261: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 269: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 278: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 288: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 296: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 341: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 484: Table 'threads' already exists -ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line 288: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line 353: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 362: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 376: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 386: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 396: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 405: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 413: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 422: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 432: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 440: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 485: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 529: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 608: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 628: Table 'threads' already exists +ERROR 1644 (HY000) at line 1048: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed show tables like "user_view"; Tables_in_performance_schema (user_view) @@ -88,20 +94,23 @@ ERROR 1050 (42S01) at line 177: Table 'e ERROR 1050 (42S01) at line 186: Table 'file_instances' already exists ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 218: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 232: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 242: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 252: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 261: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 269: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 278: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 288: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 296: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 341: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 484: Table 'threads' already exists -ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line 288: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line 353: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 362: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 376: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 386: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 396: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 405: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 413: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 422: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 432: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 440: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 485: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 529: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 608: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 628: Table 'threads' already exists +ERROR 1644 (HY000) at line 1048: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name @@ -122,20 +131,23 @@ ERROR 1050 (42S01) at line 177: Table 'e ERROR 1050 (42S01) at line 186: Table 'file_instances' already exists ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 218: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 232: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 242: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 252: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 261: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 269: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 278: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 288: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 296: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 341: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 484: Table 'threads' already exists -ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line 288: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line 353: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 362: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 376: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 386: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 396: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 405: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 413: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 422: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 432: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 440: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 485: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 529: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 608: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 628: Table 'threads' already exists +ERROR 1644 (HY000) at line 1048: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name @@ -156,20 +168,23 @@ ERROR 1050 (42S01) at line 177: Table 'e ERROR 1050 (42S01) at line 186: Table 'file_instances' already exists ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 218: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 232: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 242: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 252: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 261: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 269: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 278: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 288: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 296: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 341: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 484: Table 'threads' already exists -ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line 288: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line 353: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 362: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 376: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 386: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 396: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 405: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 413: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 422: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 432: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 440: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 485: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 529: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 608: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 628: Table 'threads' already exists +ERROR 1644 (HY000) at line 1048: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.event where db='performance_schema'; name === modified file 'mysql-test/suite/perfschema/r/schema_lc2.result' --- a/mysql-test/suite/perfschema/r/schema_lc2.result 2010-12-09 16:17:13 +0000 +++ b/mysql-test/suite/perfschema/r/schema_lc2.result 2011-03-16 09:32:27 +0000 @@ -26,6 +26,9 @@ setup_consumers setup_instruments setup_objects setup_timers +socket_instances +socket_summary_by_event_name +socket_summary_by_instance table_io_waits_summary_by_index_usage table_io_waits_summary_by_table table_lock_waits_summary_by_table No bundle (reason: useless for push emails).