From 3e740c259db557bc24ac98a7786d78636e6846e5 Mon Sep 17 00:00:00 2001 From: Sergey Petrunya Date: Tue, 9 Jul 2013 15:39:57 +0400 Subject: [PATCH] 10.0-monty: trivial test result updates --- mysql-test/suite/handler/interface.result | 2 +- .../optimizer_unfixed_bugs/r/bug41029.result | 2 +- .../optimizer_unfixed_bugs/r/bug41996.result | 2 +- .../suite/perfschema/r/dml_handler.result | 104 +++++++++--------- .../sys_vars/r/slow_query_log_func.result | 2 +- .../suite/sys_vars/r/sql_notes_func.result | 2 +- 6 files changed, 57 insertions(+), 57 deletions(-) diff --git a/mysql-test/suite/handler/interface.result b/mysql-test/suite/handler/interface.result index 96d21e7373a..cebbc2784df 100644 --- a/mysql-test/suite/handler/interface.result +++ b/mysql-test/suite/handler/interface.result @@ -269,7 +269,7 @@ handler t1 open; lock table t1 write; alter table t1 engine=csv; handler t1 read a next; -ERROR HY000: Table storage engine for 't1' doesn't have this option +ERROR HY000: Storage engine CSV of the table `test`.`t1` doesn't have this option handler t1 close; unlock tables; drop table t1; diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug41029.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug41029.result index 6b3025af842..5973c8ade46 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug41029.result +++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug41029.result @@ -7,7 +7,7 @@ set autocommit=0; use test; drop table if exists t1; Warnings: -Note 1051 Unknown table 't1' +Note 1051 Unknown table 'test.t1' create table t1 (dummy int primary key, a int unique, b int) engine=innodb; insert into t1 values(1,1,1),(3,3,3),(5,5,5); commit; diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug41996.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug41996.result index bad32010c8c..31e39d4421d 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug41996.result +++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug41996.result @@ -1,7 +1,7 @@ set session debug_dbug="+d,optimizer_innodb_icp"; drop table if exists `t1`; Warnings: -Note 1051 Unknown table 't1' +Note 1051 Unknown table 'test.t1' create table `t1` (`c` bigint, key(`c`),`a` int)engine=innodb; insert into `t1` values(2,2); delete `t1` from `t1` `a`, `t1` where `a`.`a`=`t1`.`c` ; diff --git a/mysql-test/suite/perfschema/r/dml_handler.result b/mysql-test/suite/perfschema/r/dml_handler.result index ef1292a33cc..2a1cc7035af 100644 --- a/mysql-test/suite/perfschema/r/dml_handler.result +++ b/mysql-test/suite/perfschema/r/dml_handler.result @@ -11,158 +11,158 @@ SELECT COUNT(*) FROM table_list INTO @table_count; SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=52; HANDLER performance_schema.users OPEN; -ERROR HY000: Table storage engine for 'users' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`users` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=51; HANDLER performance_schema.threads OPEN; -ERROR HY000: Table storage engine for 'threads' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`threads` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=50; HANDLER performance_schema.table_lock_waits_summary_by_table OPEN; -ERROR HY000: Table storage engine for 'table_lock_waits_summary_by_table' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`table_lock_waits_summary_by_table` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=49; HANDLER performance_schema.table_io_waits_summary_by_table OPEN; -ERROR HY000: Table storage engine for 'table_io_waits_summary_by_table' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`table_io_waits_summary_by_table` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=48; HANDLER performance_schema.table_io_waits_summary_by_index_usage OPEN; -ERROR HY000: Table storage engine for 'table_io_waits_summary_by_index_usage' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`table_io_waits_summary_by_index_usage` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=47; HANDLER performance_schema.socket_summary_by_instance OPEN; -ERROR HY000: Table storage engine for 'socket_summary_by_instance' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`socket_summary_by_instance` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=46; HANDLER performance_schema.socket_summary_by_event_name OPEN; -ERROR HY000: Table storage engine for 'socket_summary_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`socket_summary_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=45; HANDLER performance_schema.socket_instances OPEN; -ERROR HY000: Table storage engine for 'socket_instances' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`socket_instances` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=44; HANDLER performance_schema.setup_timers OPEN; -ERROR HY000: Table storage engine for 'setup_timers' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_timers` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=43; HANDLER performance_schema.setup_objects OPEN; -ERROR HY000: Table storage engine for 'setup_objects' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_objects` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=42; HANDLER performance_schema.setup_instruments OPEN; -ERROR HY000: Table storage engine for 'setup_instruments' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_instruments` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=41; HANDLER performance_schema.setup_consumers OPEN; -ERROR HY000: Table storage engine for 'setup_consumers' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_consumers` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=40; HANDLER performance_schema.setup_actors OPEN; -ERROR HY000: Table storage engine for 'setup_actors' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_actors` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=39; HANDLER performance_schema.session_connect_attrs OPEN; -ERROR HY000: Table storage engine for 'session_connect_attrs' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`session_connect_attrs` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=38; HANDLER performance_schema.session_account_connect_attrs OPEN; -ERROR HY000: Table storage engine for 'session_account_connect_attrs' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`session_account_connect_attrs` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=37; HANDLER performance_schema.rwlock_instances OPEN; -ERROR HY000: Table storage engine for 'rwlock_instances' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`rwlock_instances` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=36; HANDLER performance_schema.performance_timers OPEN; -ERROR HY000: Table storage engine for 'performance_timers' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`performance_timers` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=35; HANDLER performance_schema.objects_summary_global_by_type OPEN; -ERROR HY000: Table storage engine for 'objects_summary_global_by_type' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`objects_summary_global_by_type` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=34; HANDLER performance_schema.mutex_instances OPEN; -ERROR HY000: Table storage engine for 'mutex_instances' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`mutex_instances` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=33; HANDLER performance_schema.hosts OPEN; -ERROR HY000: Table storage engine for 'hosts' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`hosts` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=32; HANDLER performance_schema.host_cache OPEN; -ERROR HY000: Table storage engine for 'host_cache' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`host_cache` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=31; HANDLER performance_schema.file_summary_by_instance OPEN; -ERROR HY000: Table storage engine for 'file_summary_by_instance' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`file_summary_by_instance` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=30; HANDLER performance_schema.file_summary_by_event_name OPEN; -ERROR HY000: Table storage engine for 'file_summary_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`file_summary_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=29; HANDLER performance_schema.file_instances OPEN; -ERROR HY000: Table storage engine for 'file_instances' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`file_instances` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=28; HANDLER performance_schema.events_waits_summary_global_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_waits_summary_global_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_global_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=27; HANDLER performance_schema.events_waits_summary_by_user_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_waits_summary_by_user_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_user_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=26; HANDLER performance_schema.events_waits_summary_by_thread_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_waits_summary_by_thread_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_thread_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=25; HANDLER performance_schema.events_waits_summary_by_instance OPEN; -ERROR HY000: Table storage engine for 'events_waits_summary_by_instance' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_instance` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=24; HANDLER performance_schema.events_waits_summary_by_host_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_waits_summary_by_host_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_host_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=23; HANDLER performance_schema.events_waits_summary_by_account_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_waits_summary_by_account_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_account_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=22; HANDLER performance_schema.events_waits_history_long OPEN; -ERROR HY000: Table storage engine for 'events_waits_history_long' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_history_long` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=21; HANDLER performance_schema.events_waits_history OPEN; -ERROR HY000: Table storage engine for 'events_waits_history' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_history` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=20; HANDLER performance_schema.events_waits_current OPEN; -ERROR HY000: Table storage engine for 'events_waits_current' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_current` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=19; HANDLER performance_schema.events_statements_summary_global_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_statements_summary_global_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_global_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=18; HANDLER performance_schema.events_statements_summary_by_user_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_statements_summary_by_user_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_by_user_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=17; HANDLER performance_schema.events_statements_summary_by_thread_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_statements_summary_by_thread_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_by_thread_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=16; HANDLER performance_schema.events_statements_summary_by_host_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_statements_summary_by_host_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_by_host_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=15; HANDLER performance_schema.events_statements_summary_by_digest OPEN; -ERROR HY000: Table storage engine for 'events_statements_summary_by_digest' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_by_digest` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=14; HANDLER performance_schema.events_statements_summary_by_account_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_statements_summary_by_account_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_by_account_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=13; HANDLER performance_schema.events_statements_history_long OPEN; -ERROR HY000: Table storage engine for 'events_statements_history_long' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_history_long` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=12; HANDLER performance_schema.events_statements_history OPEN; -ERROR HY000: Table storage engine for 'events_statements_history' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_history` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=11; HANDLER performance_schema.events_statements_current OPEN; -ERROR HY000: Table storage engine for 'events_statements_current' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_current` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=10; HANDLER performance_schema.events_stages_summary_global_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_stages_summary_global_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_stages_summary_global_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=9; HANDLER performance_schema.events_stages_summary_by_user_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_stages_summary_by_user_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_stages_summary_by_user_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=8; HANDLER performance_schema.events_stages_summary_by_thread_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_stages_summary_by_thread_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_stages_summary_by_thread_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=7; HANDLER performance_schema.events_stages_summary_by_host_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_stages_summary_by_host_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_stages_summary_by_host_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=6; HANDLER performance_schema.events_stages_summary_by_account_by_event_name OPEN; -ERROR HY000: Table storage engine for 'events_stages_summary_by_account_by_event_name' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_stages_summary_by_account_by_event_name` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=5; HANDLER performance_schema.events_stages_history_long OPEN; -ERROR HY000: Table storage engine for 'events_stages_history_long' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_stages_history_long` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=4; HANDLER performance_schema.events_stages_history OPEN; -ERROR HY000: Table storage engine for 'events_stages_history' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_stages_history` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=3; HANDLER performance_schema.events_stages_current OPEN; -ERROR HY000: Table storage engine for 'events_stages_current' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_stages_current` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=2; HANDLER performance_schema.cond_instances OPEN; -ERROR HY000: Table storage engine for 'cond_instances' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`cond_instances` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=1; HANDLER performance_schema.accounts OPEN; -ERROR HY000: Table storage engine for 'accounts' doesn't have this option +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`accounts` doesn't have this option DROP TEMPORARY TABLE table_list; diff --git a/mysql-test/suite/sys_vars/r/slow_query_log_func.result b/mysql-test/suite/sys_vars/r/slow_query_log_func.result index fb650399597..f01b2c4c48b 100644 --- a/mysql-test/suite/sys_vars/r/slow_query_log_func.result +++ b/mysql-test/suite/sys_vars/r/slow_query_log_func.result @@ -81,7 +81,7 @@ DROP FUNCTION f_slow_current_time; DROP TABLE t1; DROP TABLE IF EXISTS t1; Warnings: -Note 1051 Unknown table 't1' +Note 1051 Unknown table 'test.t1' CREATE TABLE t1(c1 INT) ENGINE=MyISAM; DROP PROCEDURE IF EXISTS p1; CREATE PROCEDURE p1() diff --git a/mysql-test/suite/sys_vars/r/sql_notes_func.result b/mysql-test/suite/sys_vars/r/sql_notes_func.result index 87c4ecb8431..28510f027da 100644 --- a/mysql-test/suite/sys_vars/r/sql_notes_func.result +++ b/mysql-test/suite/sys_vars/r/sql_notes_func.result @@ -13,7 +13,7 @@ SELECT @@warning_count; 0 Expected DROP TABLE IF EXISTS t1; Warnings: -Note 1051 Unknown table 't1' +Note 1051 Unknown table 'test.t1' SELECT @@warning_count; @@warning_count 1