diff options
Diffstat (limited to 'mysql-test/suite/perfschema')
6 files changed, 6 insertions, 21 deletions
diff --git a/mysql-test/suite/perfschema/r/alter_table_progress.result b/mysql-test/suite/perfschema/r/alter_table_progress.result index 08c2c3a6145..31cc60927f6 100644 --- a/mysql-test/suite/perfschema/r/alter_table_progress.result +++ b/mysql-test/suite/perfschema/r/alter_table_progress.result @@ -16,8 +16,6 @@ connection default; SET DEBUG_SYNC='now WAIT_FOR found_row'; select event_id from performance_schema.events_statements_current where thread_id = @con1_thread_id into @con1_stmt_id; -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead select EVENT_NAME, WORK_COMPLETED, WORK_ESTIMATED from performance_schema.events_stages_current where (thread_id = @con1_thread_id); diff --git a/mysql-test/suite/perfschema/r/batch_table_io_func.result b/mysql-test/suite/perfschema/r/batch_table_io_func.result index 212c08c7e90..4336ebd3bd6 100644 --- a/mysql-test/suite/perfschema/r/batch_table_io_func.result +++ b/mysql-test/suite/perfschema/r/batch_table_io_func.result @@ -154,8 +154,8 @@ alter table t3 add index(id2); explain extended select t1.*, t2.*, t3.* from t1 join t2 using (id1) join t3 using (id2); id select_type table type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t1 ALL id1 NULL NULL NULL 10 100.00 Using where -1 SIMPLE t2 ref id2,id1 id1 5 test.t1.id1 10 100.00 Using where +1 SIMPLE t1 ALL id1 NULL NULL NULL 10 100.00 +1 SIMPLE t2 ALL id2,id1 NULL NULL NULL 100 10.00 Using where; Using join buffer (flat, BNL join) 1 SIMPLE t3 ref id2 id2 5 test.t2.id2 10 100.00 Warnings: Note 1003 select `test`.`t1`.`id1` AS `id1`,`test`.`t1`.`a` AS `a`,`test`.`t2`.`id1` AS `id1`,`test`.`t2`.`id2` AS `id2`,`test`.`t2`.`b` AS `b`,`test`.`t3`.`id2` AS `id2`,`test`.`t3`.`id3` AS `id3`,`test`.`t3`.`c` AS `c` from `test`.`t1` join `test`.`t2` join `test`.`t3` where `test`.`t3`.`id2` = `test`.`t2`.`id2` and `test`.`t2`.`id1` = `test`.`t1`.`id1` @@ -167,7 +167,7 @@ number_seen OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME INDEX_NAME OPERATION NUMBER_OF 11 TABLE test t1 NULL fetch 1 1 TABLE test t1 id1 read external NULL 1 TABLE test t1 id1 read normal NULL -110 TABLE test t2 id1 fetch 1 +101 TABLE test t2 NULL fetch 1 1 TABLE test t2 id2 read external NULL 1 TABLE test t2 id2 read normal NULL 100 TABLE test t3 id2 fetch 10 @@ -177,14 +177,15 @@ OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME INDEX_NAME COUNT_STAR COUNT_READ COUNT_WRI TABLE test t0 NULL 0 0 0 TABLE test t1 NULL 11 11 0 TABLE test t1 id1 0 0 0 -TABLE test t2 id1 110 110 0 +TABLE test t2 NULL 101 101 0 +TABLE test t2 id1 0 0 0 TABLE test t2 id2 0 0 0 TABLE test t3 id2 1000 1000 0 TABLE test t3 id3 0 0 0 OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME COUNT_STAR COUNT_READ COUNT_WRITE TABLE test t0 0 0 0 TABLE test t1 11 11 0 -TABLE test t2 110 110 0 +TABLE test t2 101 101 0 TABLE test t3 1000 1000 0 drop table t0; drop table t1; diff --git a/mysql-test/suite/perfschema/r/dml_handler.result b/mysql-test/suite/perfschema/r/dml_handler.result index 61bbba3189e..1510adc7148 100644 --- a/mysql-test/suite/perfschema/r/dml_handler.result +++ b/mysql-test/suite/perfschema/r/dml_handler.result @@ -6,8 +6,6 @@ SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='performance_schema' ORDER BY TABLE_NAME; SELECT COUNT(*) FROM table_list INTO @table_count; -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead # # For each table in the performance schema, attempt HANDLER...OPEN, # which should fail with an error 1031, ER_ILLEGAL_HA. diff --git a/mysql-test/suite/perfschema/r/ortho_iter.result b/mysql-test/suite/perfschema/r/ortho_iter.result index 9489c1049e5..388fac4b668 100644 --- a/mysql-test/suite/perfschema/r/ortho_iter.result +++ b/mysql-test/suite/perfschema/r/ortho_iter.result @@ -218,10 +218,6 @@ close pfs_cursor; signal sqlstate '01000' set message_text='Done', mysql_errno=12000; end $ -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead show global variables like "performance_schema%"; Variable_name Value performance_schema ON diff --git a/mysql-test/suite/perfschema/r/rpl_threads.result b/mysql-test/suite/perfschema/r/rpl_threads.result index c756b4d9046..e9ad54386ab 100644 --- a/mysql-test/suite/perfschema/r/rpl_threads.result +++ b/mysql-test/suite/perfschema/r/rpl_threads.result @@ -16,8 +16,6 @@ connection master; select ID from INFORMATION_SCHEMA.PROCESSLIST where COMMAND = "Binlog Dump" into @master_dump_pid; -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead select COMMAND, STATE from INFORMATION_SCHEMA.PROCESSLIST where ID = @master_dump_pid; @@ -33,8 +31,6 @@ connection slave; select ID from INFORMATION_SCHEMA.PROCESSLIST where STATE like "Waiting for master to send event%" into @slave_io_pid; -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead select COMMAND, STATE from INFORMATION_SCHEMA.PROCESSLIST where ID = @slave_io_pid; @@ -47,8 +43,6 @@ NAME TYPE PROCESSLIST_COMMAND PROCESSLIST_STATE select ID from INFORMATION_SCHEMA.PROCESSLIST where STATE like "Slave has read all relay log%" into @slave_sql_pid; -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead select COMMAND, STATE from INFORMATION_SCHEMA.PROCESSLIST where ID = @slave_sql_pid; diff --git a/mysql-test/suite/perfschema/r/selects.result b/mysql-test/suite/perfschema/r/selects.result index d623d45a6e8..c14d152856f 100644 --- a/mysql-test/suite/perfschema/r/selects.result +++ b/mysql-test/suite/perfschema/r/selects.result @@ -93,8 +93,6 @@ SELECT thread_id FROM performance_schema.threads WHERE PROCESSLIST_ID = conid INTO pid; END; | -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead CALL t_ps_proc(connection_id(), @p_id); DROP FUNCTION IF EXISTS t_ps_proc; CREATE FUNCTION t_ps_func(conid INT) RETURNS int |