From: Marc Alff Date: September 2 2010 12:01am Subject: bzr push into mysql-next-mr branch (marc.alff:3169 to 3170) List-Archive: http://lists.mysql.com/commits/117377 Message-Id: <201009020001.o81CcNsc020140@rcsinet13.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5696273028498757505==" --===============5696273028498757505== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 3170 Marc Alff 2010-09-01 Fixed the tests for lc1 and lc2 platforms modified: mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result mysql-test/suite/perfschema/r/schema_lc1.result mysql-test/suite/perfschema/r/schema_lc2.result mysql-test/suite/perfschema/t/setup_actors.test 3169 Marc Alff 2010-09-01 [merge] Merge mysql-next-mr --> mysql-next-mr-wl4674 removed: include/mysql/plugin.h.pp mysql-test/include/have_thread_concurrency.inc mysql-test/suite/parts/inc/partition_crash.inc mysql-test/suite/parts/r/partition_debug_innodb.result mysql-test/suite/parts/t/partition_debug_innodb-master.opt mysql-test/suite/parts/t/partition_debug_innodb.test mysql-test/suite/perfschema/r/ddl_ews_by_event_name.result mysql-test/suite/perfschema/r/ddl_setup_objects.result mysql-test/suite/perfschema/r/dml_ews_by_event_name.result mysql-test/suite/perfschema/r/dml_setup_objects.result mysql-test/suite/perfschema/t/ddl_ews_by_event_name.test mysql-test/suite/perfschema/t/ddl_setup_objects.test mysql-test/suite/perfschema/t/dml_ews_by_event_name.test mysql-test/suite/perfschema/t/dml_setup_objects.test mysql-test/suite/rpl/t/rpl_mixed_row_innodb.test storage/perfschema/table_setup_objects.cc storage/perfschema/table_setup_objects.h added: include/mysql/plugin_audit.h.pp include/mysql/plugin_ftparser.h.pp include/mysql/service_thd_wait.h include/mysql/service_thread_scheduler.h libservices/my_thread_scheduler_service.c libservices/thd_wait_service.c mysql-test/include/not_blackhole.inc mysql-test/r/ctype_utf16_def.result mysql-test/r/handler_read_last.result mysql-test/r/mysql_not_windows.result mysql-test/r/partition_not_blackhole.result mysql-test/std_data/parts/t1_blackhole.frm mysql-test/std_data/parts/t1_blackhole.par mysql-test/suite/parts/inc/partition_crash.inc mysql-test/suite/parts/inc/partition_crash_add.inc mysql-test/suite/parts/inc/partition_crash_change.inc mysql-test/suite/parts/inc/partition_crash_drop.inc mysql-test/suite/parts/inc/partition_fail.inc mysql-test/suite/parts/inc/partition_fail_add.inc mysql-test/suite/parts/inc/partition_fail_change.inc mysql-test/suite/parts/inc/partition_fail_drop.inc mysql-test/suite/parts/inc/partition_mgm_crash.inc mysql-test/suite/parts/r/part_ctype_utf32.result mysql-test/suite/parts/r/partition_debug_innodb.result mysql-test/suite/parts/r/partition_debug_myisam.result mysql-test/suite/parts/t/part_ctype_utf32.test mysql-test/suite/parts/t/partition_debug_innodb-master.opt mysql-test/suite/parts/t/partition_debug_innodb.test mysql-test/suite/parts/t/partition_debug_myisam-master.opt mysql-test/suite/parts/t/partition_debug_myisam.test mysql-test/suite/perfschema/r/bad_option_3.result mysql-test/suite/perfschema/r/bad_option_4.result mysql-test/suite/perfschema/r/bad_option_5.result mysql-test/suite/perfschema/r/ddl_ews_global_by_event_name.result mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result mysql-test/suite/perfschema/r/short_option_1.result mysql-test/suite/perfschema/r/short_option_2.result mysql-test/suite/perfschema/t/bad_option_3.test mysql-test/suite/perfschema/t/bad_option_4.test mysql-test/suite/perfschema/t/bad_option_5.test mysql-test/suite/perfschema/t/ddl_ews_global_by_event_name.test mysql-test/suite/perfschema/t/dml_ews_global_by_event_name.test mysql-test/suite/perfschema/t/short_option_1-master.opt mysql-test/suite/perfschema/t/short_option_1.test mysql-test/suite/perfschema/t/short_option_2-master.opt mysql-test/suite/perfschema/t/short_option_2.test mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-slave.opt mysql-test/t/ctype_utf16_def-master.opt mysql-test/t/ctype_utf16_def.test mysql-test/t/handler_read_last.test mysql-test/t/mysql_not_windows.test mysql-test/t/partition_not_blackhole-master.opt mysql-test/t/partition_not_blackhole.test sql/sql_admin.cc sql/sql_admin.h sql/sql_callback.h sql/sql_reload.cc sql/sql_reload.h storage/perfschema/table_ews_global_by_event_name.cc storage/perfschema/table_ews_global_by_event_name.h renamed: sql/sql_alter_table.cc => sql/sql_alter.cc sql/sql_alter_table.h => sql/sql_alter.h modified: .bzrignore Makefile.am client/mysql.cc client/mysqltest.cc client/sql_string.cc cmake/abi_check.cmake cmake/do_abi_check.cmake config/ac-macros/plugins.m4 configure.in include/Makefile.am include/my_pthread.h include/mysql/plugin.h include/mysql/psi/mysql_thread.h include/mysql/services.h include/service_versions.h include/thr_lock.h include/violite.h libmysqld/CMakeLists.txt libmysqld/Makefile.am libservices/CMakeLists.txt libservices/Makefile.am mysql-test/CMakeLists.txt mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.inc mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.test mysql-test/extra/rpl_tests/rpl_innodb.test mysql-test/include/check_no_concurrent_insert.inc mysql-test/include/commit.inc mysql-test/include/ctype_numconv.inc mysql-test/include/deadlock.inc mysql-test/include/handler.inc mysql-test/include/mix1.inc mysql-test/include/mysqlhotcopy.inc mysql-test/include/range.inc mysql-test/lib/v1/mysql-test-run.pl mysql-test/mysql-test-run.pl mysql-test/r/auto_increment.result mysql-test/r/case.result mysql-test/r/commit_1innodb.result mysql-test/r/create.result mysql-test/r/ctype_binary.result mysql-test/r/ctype_cp1251.result mysql-test/r/ctype_cp932_binlog_stm.result mysql-test/r/ctype_latin1.result mysql-test/r/ctype_ucs.result mysql-test/r/ctype_utf32.result mysql-test/r/ctype_utf8.result mysql-test/r/delayed.result mysql-test/r/delete.result mysql-test/r/endspace.result mysql-test/r/events_trans.result mysql-test/r/explain.result mysql-test/r/flush.result mysql-test/r/func_gconcat.result mysql-test/r/func_group.result mysql-test/r/func_if.result mysql-test/r/func_misc.result mysql-test/r/func_str.result mysql-test/r/func_time.result mysql-test/r/information_schema_inno.result mysql-test/r/innodb_icp_none.result mysql-test/r/innodb_mrr_none.result mysql-test/r/insert_select.result mysql-test/r/join.result mysql-test/r/join_optimizer.result mysql-test/r/join_outer.result mysql-test/r/locale.result mysql-test/r/mdl_sync.result mysql-test/r/merge.result mysql-test/r/mysqlbinlog.result mysql-test/r/mysqlbinlog_row.result mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/r/not_partition.result mysql-test/r/null_key_all.result mysql-test/r/null_key_none.result mysql-test/r/partition.result mysql-test/r/partition_disabled.result mysql-test/r/partition_innodb.result mysql-test/r/partition_truncate.result mysql-test/r/ps_ddl.result mysql-test/r/query_cache.result mysql-test/r/range_all.result mysql-test/r/range_none.result mysql-test/r/rowid_order_innodb.result mysql-test/r/schema.result mysql-test/r/select_all.result mysql-test/r/select_none.result mysql-test/r/single_delete_update.result mysql-test/r/sp-lock.result mysql-test/r/sp-threads.result mysql-test/r/subquery_none.result mysql-test/r/trigger.result mysql-test/r/type_bit_innodb.result mysql-test/r/union.result mysql-test/r/update.result mysql-test/suite/binlog/r/binlog_database.result mysql-test/suite/binlog/r/binlog_innodb_row.result mysql-test/suite/binlog/r/binlog_row_binlog.result mysql-test/suite/binlog/r/binlog_row_drop_tbl.result mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result mysql-test/suite/binlog/r/binlog_stm_binlog.result mysql-test/suite/binlog/r/binlog_stm_blackhole.result mysql-test/suite/binlog/r/binlog_stm_drop_tbl.result mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result mysql-test/suite/binlog/r/binlog_stm_row.result mysql-test/suite/binlog/t/binlog_stm_row.test mysql-test/suite/funcs_1/datadict/processlist_val.inc mysql-test/suite/funcs_1/r/processlist_val_no_prot.result mysql-test/suite/funcs_1/r/processlist_val_ps.result mysql-test/suite/funcs_2/charset/charset_master.test mysql-test/suite/funcs_2/r/innodb_charset.result mysql-test/suite/funcs_2/r/memory_charset.result mysql-test/suite/funcs_2/r/myisam_charset.result mysql-test/suite/funcs_2/t/disabled.def mysql-test/suite/innodb/r/innodb_gis.result mysql-test/suite/innodb/r/innodb_mysql.result mysql-test/suite/innodb/t/innodb-lock.test mysql-test/suite/innodb/t/innodb_mysql.test mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result mysql-test/suite/ndb/r/ndb_binlog_ignore_db.result mysql-test/suite/ndb/r/ndb_binlog_log_bin.result mysql-test/suite/ndb/r/ndb_binlog_multi.result mysql-test/suite/parts/inc/partition_mgm.inc mysql-test/suite/parts/r/partition_debug_sync_innodb.result mysql-test/suite/parts/r/partition_mgm_lc0_archive.result mysql-test/suite/parts/r/partition_mgm_lc1_archive.result mysql-test/suite/parts/r/partition_mgm_lc2_archive.result mysql-test/suite/parts/r/partition_special_innodb.result mysql-test/suite/parts/r/partition_special_myisam.result mysql-test/suite/parts/t/partition_debug_sync_innodb.test mysql-test/suite/parts/t/partition_special_innodb-master.opt mysql-test/suite/parts/t/partition_special_innodb.test mysql-test/suite/parts/t/partition_special_myisam.test mysql-test/suite/perfschema/include/schema.inc mysql-test/suite/perfschema/include/start_server_common.inc mysql-test/suite/perfschema/r/aggregate.result mysql-test/suite/perfschema/r/binlog_mix.result mysql-test/suite/perfschema/r/binlog_row.result mysql-test/suite/perfschema/r/binlog_stmt.result mysql-test/suite/perfschema/r/dml_setup_instruments.result mysql-test/suite/perfschema/r/func_file_io.result mysql-test/suite/perfschema/r/information_schema.result mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result mysql-test/suite/perfschema/r/schema.result mysql-test/suite/perfschema/r/schema_lc0.result mysql-test/suite/perfschema/r/server_init.result mysql-test/suite/perfschema/r/setup_actors.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_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/t/aggregate.test mysql-test/suite/perfschema/t/func_file_io.test mysql-test/suite/perfschema/t/setup_actors.test mysql-test/suite/perfschema/t/start_server_nothing.test mysql-test/suite/rpl/r/rpl_conditional_comments.result mysql-test/suite/rpl/r/rpl_create_if_not_exists.result mysql-test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result mysql-test/suite/rpl/r/rpl_drop_if_exists.result mysql-test/suite/rpl/r/rpl_flush_logs.result mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result mysql-test/suite/rpl/r/rpl_non_direct_row_mixing_engines.result mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result mysql-test/suite/rpl/r/rpl_row_drop.result mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result mysql-test/suite/rpl/r/rpl_row_log.result mysql-test/suite/rpl/r/rpl_row_log_innodb.result mysql-test/suite/rpl/r/rpl_row_mixing_engines.result mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result mysql-test/suite/rpl/r/rpl_server_id.result mysql-test/suite/rpl/r/rpl_sp.result mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result mysql-test/suite/rpl/r/rpl_stm_log.result mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result mysql-test/suite/rpl/t/rpl_create_if_not_exists.test mysql-test/suite/rpl/t/rpl_drop.test mysql-test/suite/rpl/t/rpl_flush_logs.test mysql-test/suite/rpl/t/rpl_savepoint.test mysql-test/suite/rpl/t/rpl_sp.test mysql-test/suite/rpl/t/rpl_stm_innodb.test mysql-test/suite/rpl/t/rpl_view_multi.test mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_basic.result mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_implicit_commit_binlog.result mysql-test/suite/rpl_ndb/r/rpl_ndb_row_implicit_commit_binlog.result mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result mysql-test/suite/rpl_ndb/t/disabled.def mysql-test/suite/rpl_ndb/t/rpl_ndb_2other-slave.opt mysql-test/suite/sys_vars/r/concurrent_insert_func.result mysql-test/suite/sys_vars/r/innodb_strict_mode_basic.result mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_func.result mysql-test/suite/sys_vars/t/concurrent_insert_func.test mysql-test/suite/sys_vars/t/delayed_insert_limit_func.test mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func.test mysql-test/suite/sys_vars/t/secure_file_priv.test mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test mysql-test/suite/sys_vars/t/thread_concurrency_basic.test mysql-test/t/auto_increment.test mysql-test/t/case.test mysql-test/t/create.test mysql-test/t/ctype_utf32.test mysql-test/t/ctype_utf8.test mysql-test/t/delayed.test mysql-test/t/delete.test mysql-test/t/disabled.def mysql-test/t/endspace.test mysql-test/t/events_trans.test mysql-test/t/explain.test mysql-test/t/flush.test mysql-test/t/func_gconcat.test mysql-test/t/func_group.test mysql-test/t/func_if.test mysql-test/t/func_misc.test mysql-test/t/func_str.test mysql-test/t/func_time.test mysql-test/t/information_schema.test mysql-test/t/information_schema_inno.test mysql-test/t/innodb_mysql_lock.test mysql-test/t/innodb_mysql_lock2.test mysql-test/t/insert_notembedded.test mysql-test/t/kill.test mysql-test/t/lock_multi.test mysql-test/t/lock_sync.test mysql-test/t/mdl_sync.test mysql-test/t/merge-big.test mysql-test/t/merge.test mysql-test/t/multi_update.test mysql-test/t/not_partition.test mysql-test/t/partition_innodb.test mysql-test/t/partition_truncate.test mysql-test/t/query_cache.test mysql-test/t/query_cache_28249.test mysql-test/t/schema.test mysql-test/t/sp-lock.test mysql-test/t/sp_notembedded.test mysql-test/t/sp_sync.test mysql-test/t/status.test mysql-test/t/trigger.test mysql-test/t/trigger_notembedded.test mysql-test/t/union.test mysql-test/t/view.test mysys/my_getopt.c mysys/my_init.c mysys/my_thr_init.c mysys/thr_lock.c mysys/thr_rwlock.c scripts/CMakeLists.txt scripts/mysql_system_tables.sql scripts/mysqlaccess.conf* sql/CMakeLists.txt sql/Makefile.am sql/authors.h sql/binlog.cc sql/binlog.h sql/datadict.cc sql/datadict.h sql/event_db_repository.cc sql/events.cc sql/field.cc sql/gen_lex_hash.cc sql/ha_ndbcluster.cc sql/ha_ndbcluster_binlog.cc sql/ha_ndbcluster_binlog.h sql/ha_partition.cc sql/handler.cc sql/handler.h sql/item.cc sql/item.h sql/item_cmpfunc.cc sql/item_func.cc sql/item_strfunc.cc sql/item_strfunc.h sql/item_sum.cc sql/item_sum.h sql/lock.cc sql/lock.h sql/log.cc sql/log_event.cc sql/mdl.cc sql/mdl.h sql/mysqld.cc sql/mysqld.h sql/opt_range.cc sql/scheduler.cc sql/scheduler.h sql/set_var.cc sql/sql_audit.cc sql/sql_audit.h sql/sql_base.cc sql/sql_base.h sql/sql_bootstrap.h sql/sql_class.cc sql/sql_class.h sql/sql_connect.cc sql/sql_connect.h sql/sql_handler.cc sql/sql_insert.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_parse.cc sql/sql_parse.h sql/sql_partition.cc sql/sql_partition_admin.cc sql/sql_partition_admin.h sql/sql_plugin.cc sql/sql_plugin_services.h sql/sql_prepare.cc sql/sql_rename.cc sql/sql_select.cc sql/sql_select.h sql/sql_servers.cc sql/sql_show.cc sql/sql_string.cc sql/sql_table.cc sql/sql_table.h sql/sql_test.cc sql/sql_trigger.cc sql/sql_truncate.cc sql/sql_truncate.h sql/sql_view.cc sql/sql_yacc.yy sql/sys_vars.cc sql/table.cc sql/table.h storage/innobase/btr/btr0cur.c storage/innobase/btr/btr0sea.c storage/innobase/buf/buf0flu.c storage/innobase/buf/buf0rea.c storage/innobase/dict/dict0load.c storage/innobase/ha/ha0ha.c storage/innobase/handler/ha_innodb.cc storage/innobase/handler/ha_innodb.h storage/innobase/ibuf/ibuf0ibuf.c storage/innobase/include/btr0cur.h storage/innobase/include/btr0sea.h storage/innobase/include/dict0load.h storage/innobase/include/ha0ha.h storage/innobase/include/ha_prototypes.h storage/innobase/include/ibuf0ibuf.ic storage/innobase/include/row0mysql.h storage/innobase/include/univ.i storage/innobase/plug.in storage/innobase/row/row0sel.c storage/innobase/srv/srv0srv.c storage/myisam/ft_stopwords.c storage/myisam/mi_key.c storage/perfschema/CMakeLists.txt storage/perfschema/Makefile.am storage/perfschema/pfs.cc storage/perfschema/pfs_engine_table.cc storage/perfschema/pfs_server.h storage/perfschema/pfs_stat.h storage/perfschema/table_events_waits_summary.cc storage/perfschema/table_events_waits_summary.h support-files/mysql.spec.sh vio/vio.c vio/vio_priv.h vio/viosocket.c vio/viossl.c sql/sql_alter.cc sql/sql_alter.h === modified file 'mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result' --- a/mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result 2010-08-12 15:25:01 +0000 +++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result 2010-09-02 00:00:20 +0000 @@ -21,11 +21,12 @@ ERROR 1050 (42S01) at line 203: Table 'f ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 266: Table 'threads' already exists -ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 287: Table 'threads' already exists +ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed show tables like "user_table"; Tables_in_performance_schema (user_table) @@ -51,11 +52,12 @@ ERROR 1050 (42S01) at line 203: Table 'f ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 266: Table 'threads' already exists -ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 287: Table 'threads' already exists +ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed show tables like "user_view"; Tables_in_performance_schema (user_view) @@ -79,11 +81,12 @@ ERROR 1050 (42S01) at line 203: Table 'f ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 266: Table 'threads' already exists -ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 287: Table 'threads' already exists +ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name @@ -107,11 +110,12 @@ ERROR 1050 (42S01) at line 203: Table 'f ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 266: Table 'threads' already exists -ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 287: Table 'threads' already exists +ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name @@ -135,11 +139,12 @@ ERROR 1050 (42S01) at line 203: Table 'f ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 266: Table 'threads' already exists -ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 287: Table 'threads' already exists +ERROR 1644 (HY000) at line 703: 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/pfs_upgrade_lc2.result' --- a/mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result 2010-09-01 22:59:33 +0000 +++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result 2010-09-02 00:00:20 +0000 @@ -21,21 +21,12 @@ ERROR 1050 (42S01) at line 203: Table 'f ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists -<<<<<<< TREE ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 262: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 271: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 279: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 299: Table 'threads' already exists -ERROR 1644 (HY000) at line 715: Unexpected content found in the performance_schema database. -======= -ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 266: Table 'threads' already exists -ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database. ->>>>>>> MERGE-SOURCE +ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 287: Table 'threads' already exists +ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed show tables like "user_table"; Tables_in_performance_schema (user_table) @@ -61,21 +52,12 @@ ERROR 1050 (42S01) at line 203: Table 'f ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists -<<<<<<< TREE ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 262: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 271: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 279: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 299: Table 'threads' already exists -ERROR 1644 (HY000) at line 715: Unexpected content found in the performance_schema database. -======= -ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 266: Table 'threads' already exists -ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database. ->>>>>>> MERGE-SOURCE +ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 287: Table 'threads' already exists +ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed show tables like "user_view"; Tables_in_performance_schema (user_view) @@ -99,21 +81,12 @@ ERROR 1050 (42S01) at line 203: Table 'f ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists -<<<<<<< TREE ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 262: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 271: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 279: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 299: Table 'threads' already exists -ERROR 1644 (HY000) at line 715: Unexpected content found in the performance_schema database. -======= -ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 266: Table 'threads' already exists -ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database. ->>>>>>> MERGE-SOURCE +ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 287: Table 'threads' already exists +ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name @@ -137,21 +110,12 @@ ERROR 1050 (42S01) at line 203: Table 'f ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists -<<<<<<< TREE ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 262: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 271: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 279: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 299: Table 'threads' already exists -ERROR 1644 (HY000) at line 715: Unexpected content found in the performance_schema database. -======= -ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 266: Table 'threads' already exists -ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database. ->>>>>>> MERGE-SOURCE +ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 287: Table 'threads' already exists +ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name @@ -175,21 +139,12 @@ ERROR 1050 (42S01) at line 203: Table 'f ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists -<<<<<<< TREE ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 262: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 271: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 279: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 299: Table 'threads' already exists -ERROR 1644 (HY000) at line 715: Unexpected content found in the performance_schema database. -======= -ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 266: Table 'threads' already exists -ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database. ->>>>>>> MERGE-SOURCE +ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 287: Table 'threads' already exists +ERROR 1644 (HY000) at line 703: 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_lc1.result' --- a/mysql-test/suite/perfschema/r/schema_lc1.result 2010-07-29 18:00:27 +0000 +++ b/mysql-test/suite/perfschema/r/schema_lc1.result 2010-09-02 00:00:20 +0000 @@ -11,9 +11,9 @@ cond_instances events_waits_current events_waits_history events_waits_history_long -events_waits_summary_by_event_name events_waits_summary_by_instance events_waits_summary_by_thread_by_event_name +events_waits_summary_global_by_event_name file_instances file_summary_by_event_name file_summary_by_instance @@ -23,7 +23,6 @@ rwlock_instances setup_actors setup_consumers setup_instruments -setup_objects setup_timers threads show create table COND_INSTANCES; @@ -92,31 +91,31 @@ EVENTS_WAITS_HISTORY_LONG CREATE TABLE ` `NUMBER_OF_BYTES` bigint(20) unsigned DEFAULT NULL, `FLAGS` int(10) unsigned DEFAULT NULL ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 -show create table EVENTS_WAITS_SUMMARY_BY_EVENT_NAME; +show create table EVENTS_WAITS_SUMMARY_BY_INSTANCE; Table Create Table -EVENTS_WAITS_SUMMARY_BY_EVENT_NAME CREATE TABLE `events_waits_summary_by_event_name` ( +EVENTS_WAITS_SUMMARY_BY_INSTANCE CREATE TABLE `events_waits_summary_by_instance` ( `EVENT_NAME` varchar(128) NOT NULL, + `OBJECT_INSTANCE_BEGIN` bigint(20) NOT NULL, `COUNT_STAR` bigint(20) unsigned NOT NULL, `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL, `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL, `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL, `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 -show create table EVENTS_WAITS_SUMMARY_BY_INSTANCE; +show create table EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; Table Create Table -EVENTS_WAITS_SUMMARY_BY_INSTANCE CREATE TABLE `events_waits_summary_by_instance` ( +EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME CREATE TABLE `events_waits_summary_by_thread_by_event_name` ( + `THREAD_ID` int(11) NOT NULL, `EVENT_NAME` varchar(128) NOT NULL, - `OBJECT_INSTANCE_BEGIN` bigint(20) NOT NULL, `COUNT_STAR` bigint(20) unsigned NOT NULL, `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL, `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL, `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL, `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 -show create table EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; +show create table EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; Table Create Table -EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME CREATE TABLE `events_waits_summary_by_thread_by_event_name` ( - `THREAD_ID` int(11) NOT NULL, +EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME CREATE TABLE `events_waits_summary_global_by_event_name` ( `EVENT_NAME` varchar(128) NOT NULL, `COUNT_STAR` bigint(20) unsigned NOT NULL, `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL, @@ -193,16 +192,6 @@ SETUP_INSTRUMENTS CREATE TABLE `setup_in `ENABLED` enum('YES','NO') NOT NULL, `TIMED` enum('YES','NO') NOT NULL ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 -show create table SETUP_OBJECTS; -Table Create Table -SETUP_OBJECTS CREATE TABLE `setup_objects` ( - `OBJECT_TYPE` varchar(64) DEFAULT NULL, - `OBJECT_SCHEMA` varchar(64) DEFAULT NULL, - `OBJECT_NAME` varchar(64) DEFAULT NULL, - `ENABLED` enum('YES','NO') NOT NULL, - `TIMED` enum('YES','NO') NOT NULL, - `AGGREGATED` enum('YES','NO') NOT NULL -) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 show create table SETUP_TIMERS; Table Create Table SETUP_TIMERS CREATE TABLE `setup_timers` ( === modified file 'mysql-test/suite/perfschema/r/schema_lc2.result' --- a/mysql-test/suite/perfschema/r/schema_lc2.result 2010-07-29 18:00:27 +0000 +++ b/mysql-test/suite/perfschema/r/schema_lc2.result 2010-09-02 00:00:20 +0000 @@ -11,9 +11,9 @@ COND_INSTANCES EVENTS_WAITS_CURRENT EVENTS_WAITS_HISTORY EVENTS_WAITS_HISTORY_LONG -EVENTS_WAITS_SUMMARY_BY_EVENT_NAME EVENTS_WAITS_SUMMARY_BY_INSTANCE EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME +EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME FILE_INSTANCES FILE_SUMMARY_BY_EVENT_NAME FILE_SUMMARY_BY_INSTANCE @@ -23,7 +23,6 @@ RWLOCK_INSTANCES SETUP_ACTORS SETUP_CONSUMERS SETUP_INSTRUMENTS -SETUP_OBJECTS SETUP_TIMERS THREADS show create table COND_INSTANCES; @@ -92,31 +91,31 @@ EVENTS_WAITS_HISTORY_LONG CREATE TABLE ` `NUMBER_OF_BYTES` bigint(20) unsigned DEFAULT NULL, `FLAGS` int(10) unsigned DEFAULT NULL ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 -show create table EVENTS_WAITS_SUMMARY_BY_EVENT_NAME; +show create table EVENTS_WAITS_SUMMARY_BY_INSTANCE; Table Create Table -EVENTS_WAITS_SUMMARY_BY_EVENT_NAME CREATE TABLE `EVENTS_WAITS_SUMMARY_BY_EVENT_NAME` ( +EVENTS_WAITS_SUMMARY_BY_INSTANCE CREATE TABLE `EVENTS_WAITS_SUMMARY_BY_INSTANCE` ( `EVENT_NAME` varchar(128) NOT NULL, + `OBJECT_INSTANCE_BEGIN` bigint(20) NOT NULL, `COUNT_STAR` bigint(20) unsigned NOT NULL, `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL, `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL, `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL, `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 -show create table EVENTS_WAITS_SUMMARY_BY_INSTANCE; +show create table EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; Table Create Table -EVENTS_WAITS_SUMMARY_BY_INSTANCE CREATE TABLE `EVENTS_WAITS_SUMMARY_BY_INSTANCE` ( +EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME CREATE TABLE `EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME` ( + `THREAD_ID` int(11) NOT NULL, `EVENT_NAME` varchar(128) NOT NULL, - `OBJECT_INSTANCE_BEGIN` bigint(20) NOT NULL, `COUNT_STAR` bigint(20) unsigned NOT NULL, `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL, `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL, `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL, `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 -show create table EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; +show create table EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; Table Create Table -EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME CREATE TABLE `EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME` ( - `THREAD_ID` int(11) NOT NULL, +EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME CREATE TABLE `EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME` ( `EVENT_NAME` varchar(128) NOT NULL, `COUNT_STAR` bigint(20) unsigned NOT NULL, `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL, @@ -193,16 +192,6 @@ SETUP_INSTRUMENTS CREATE TABLE `SETUP_IN `ENABLED` enum('YES','NO') NOT NULL, `TIMED` enum('YES','NO') NOT NULL ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 -show create table SETUP_OBJECTS; -Table Create Table -SETUP_OBJECTS CREATE TABLE `SETUP_OBJECTS` ( - `OBJECT_TYPE` varchar(64) DEFAULT NULL, - `OBJECT_SCHEMA` varchar(64) DEFAULT NULL, - `OBJECT_NAME` varchar(64) DEFAULT NULL, - `ENABLED` enum('YES','NO') NOT NULL, - `TIMED` enum('YES','NO') NOT NULL, - `AGGREGATED` enum('YES','NO') NOT NULL -) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 show create table SETUP_TIMERS; Table Create Table SETUP_TIMERS CREATE TABLE `SETUP_TIMERS` ( === modified file 'mysql-test/suite/perfschema/t/setup_actors.test' --- a/mysql-test/suite/perfschema/t/setup_actors.test 2010-09-01 22:59:33 +0000 +++ b/mysql-test/suite/perfschema/t/setup_actors.test 2010-09-02 00:00:20 +0000 @@ -218,6 +218,7 @@ where PROCESSLIST_ID = connection_id(); --echo # Switch to (con5, localhost, user5, , ) connect (con5, localhost, user5, , ); +--replace_result '\'threads' '\'THREADS' --error ER_TABLEACCESS_DENIED_ERROR select * from performance_schema.THREADS; # 1. INSTRUMENTED must be YES because there are two matches --===============5696273028498757505== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/marc.alff@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@stripped # target_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-wl4674/ # testament_sha1: 6f6b1edb9dcf7639bdbe229c20d5bf44d634c5e0 # timestamp: 2010-09-01 18:01:06 -0600 # source_branch: file:///Users/malff/BZR_TREE/mysql-next-mr/ # base_revision_id: marc.alff@stripped\ # 1qbg7k9zhrehkwo7 # # Begin bundle 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 --===============5696273028498757505==--