From 1f4a9f086ae5ff66a10f84e1fda5bcc38b347883 Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Mon, 12 Dec 2022 20:06:32 +0200
Subject: Removed "<select expression> INTO <destination>" deprication.

This was done after discussions with Igor, Sanja and Bar.

The main reason for removing the deprication was to ensure that MariaDB
is always backward compatible whenever possible.

Other things:
- Added statistics counters, mainly for the feedback plugin.
  - INTO OUTFILE
  - INTO variable
  - If INTO is using the old syntax (end of query)
---
 .../suite/compat/oracle/r/sp-package-innodb.result     |  2 --
 mysql-test/suite/compat/oracle/r/sp-package.result     |  9 ---------
 mysql-test/suite/compat/oracle/r/sp-row.result         | 18 ------------------
 mysql-test/suite/compat/oracle/r/update_innodb.result  |  4 ----
 mysql-test/suite/engines/funcs/r/rpl_drop_db.result    |  2 --
 .../suite/engines/funcs/r/rpl_misc_functions.result    |  2 --
 mysql-test/suite/handler/aria.result                   |  2 --
 mysql-test/suite/handler/heap.result                   |  2 --
 mysql-test/suite/handler/innodb.result                 |  2 --
 mysql-test/suite/handler/myisam.result                 |  2 --
 mysql-test/suite/innodb/r/innodb_bug30919.result       |  4 ----
 mysql-test/suite/innodb/r/innodb_bug51920.result       |  2 --
 .../suite/perfschema/r/alter_table_progress.result     |  2 --
 mysql-test/suite/perfschema/r/dml_handler.result       |  2 --
 mysql-test/suite/perfschema/r/ortho_iter.result        |  4 ----
 mysql-test/suite/perfschema/r/rpl_threads.result       |  6 ------
 mysql-test/suite/perfschema/r/selects.result           |  2 --
 mysql-test/suite/rpl/r/rpl_drop_db.result              |  2 --
 mysql-test/suite/rpl/r/rpl_innodb_bug28430.result      | 12 ------------
 mysql-test/suite/rpl/r/rpl_innodb_bug30888.result      |  4 ----
 mysql-test/suite/rpl/r/rpl_mdev12179.result            |  2 --
 mysql-test/suite/rpl/r/rpl_misc_functions.result       |  2 --
 .../r/innodb_fil_make_page_dirty_debug_basic.result    |  2 --
 .../r/innodb_saved_page_number_debug_basic.result      |  2 --
 mysql-test/suite/sys_vars/r/secure_file_priv.result    |  2 --
 mysql-test/suite/versioning/r/alter.result             |  2 --
 mysql-test/suite/versioning/r/commit_id.result         | 14 --------------
 mysql-test/suite/versioning/r/create.result            | 12 ------------
 mysql-test/suite/versioning/r/foreign.result           |  2 --
 mysql-test/suite/versioning/r/insert.result            |  2 --
 mysql-test/suite/versioning/r/load_data.result         |  2 --
 mysql-test/suite/versioning/r/partition.result         | 16 ----------------
 mysql-test/suite/versioning/r/select,trx_id.rdiff      | 11 -----------
 mysql-test/suite/versioning/r/select.result            |  8 --------
 mysql-test/suite/versioning/r/select2,trx_id.rdiff     | 16 ++++++++--------
 mysql-test/suite/versioning/r/select2.result           |  4 ----
 mysql-test/suite/versioning/r/trx_id.result            | 16 ----------------
 37 files changed, 8 insertions(+), 192 deletions(-)

(limited to 'mysql-test/suite')

diff --git a/mysql-test/suite/compat/oracle/r/sp-package-innodb.result b/mysql-test/suite/compat/oracle/r/sp-package-innodb.result
index 0ac357df5da..50eb2dc6cd0 100644
--- a/mysql-test/suite/compat/oracle/r/sp-package-innodb.result
+++ b/mysql-test/suite/compat/oracle/r/sp-package-innodb.result
@@ -23,8 +23,6 @@ a:=a+1;
 INSERT INTO t1 VALUES (a,'pkg1 initialization');
 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 pkg1.p1;
 SELECT * FROM t1 ORDER BY a;
 a	routine
diff --git a/mysql-test/suite/compat/oracle/r/sp-package.result b/mysql-test/suite/compat/oracle/r/sp-package.result
index ef0acea5da1..ef4b3f5db1f 100644
--- a/mysql-test/suite/compat/oracle/r/sp-package.result
+++ b/mysql-test/suite/compat/oracle/r/sp-package.result
@@ -2062,8 +2062,6 @@ $$
 CALL p1.p1();
 @a
 11
-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 p1.p1();
 @a
 12
@@ -2095,8 +2093,6 @@ BEGIN
 SELECT MAX(a) FROM t1 INTO @a;
 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 p1.p1();
 @a
 11
@@ -2130,8 +2126,6 @@ BEGIN
 SELECT 1 FROM t1 INTO @a;
 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 p1.p1();
 ERROR 42S02: Table 'test.t1' doesn't exist
 SELECT p1.f1();
@@ -2690,9 +2684,6 @@ SELECT * FROM t1 INTO b;
 SELECT b.a, b.b;
 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
 CALL p1.p1;
 b.a	b.b
 10	b
diff --git a/mysql-test/suite/compat/oracle/r/sp-row.result b/mysql-test/suite/compat/oracle/r/sp-row.result
index 0b23f303030..b3a0ae15711 100644
--- a/mysql-test/suite/compat/oracle/r/sp-row.result
+++ b/mysql-test/suite/compat/oracle/r/sp-row.result
@@ -2835,8 +2835,6 @@ SELECT * FROM t1 INTO rec1;
 SELECT rec1.a, rec1.b;
 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 p1();
 ERROR 21000: The used SELECT statements have a different number of columns
 DROP TABLE t1;
@@ -2851,8 +2849,6 @@ SELECT * FROM t1 INTO rec1, rec1;
 SELECT rec1.a, rec1.b;
 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 p1();
 ERROR 21000: Operand should contain 2 column(s)
 DROP TABLE t1;
@@ -2867,8 +2863,6 @@ SELECT * FROM t1 INTO rec1;
 SELECT rec1.a, rec1.b;
 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 p1();
 rec1.a	rec1.b
 10	b10
@@ -2884,8 +2878,6 @@ SELECT 10,'a','b' FROM t1 INTO rec1;
 SELECT rec1.a, rec1.b;
 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 p1();
 ERROR 21000: The used SELECT statements have a different number of columns
 DROP TABLE t1;
@@ -2900,8 +2892,6 @@ SELECT 10,'a' FROM t1 INTO rec1, rec1;
 SELECT rec1.a, rec1.b;
 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 p1();
 ERROR 21000: Operand should contain 2 column(s)
 DROP TABLE t1;
@@ -2916,8 +2906,6 @@ SELECT * FROM t1 INTO rec1;
 SELECT rec1.a, rec1.b;
 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 p1();
 rec1.a	rec1.b
 10	b10
@@ -2934,8 +2922,6 @@ SELECT * FROM t1 INTO rec1;
 SELECT rec1.a, rec1.b;
 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 p1();
 ERROR 21000: The used SELECT statements have a different number of columns
 DROP TABLE t1;
@@ -2951,8 +2937,6 @@ SELECT * FROM t1 INTO rec1, rec1;
 SELECT rec1.a, rec1.b;
 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 p1();
 ERROR 21000: Operand should contain 2 column(s)
 DROP TABLE t1;
@@ -2968,8 +2952,6 @@ SELECT * FROM t1 INTO rec1;
 SELECT rec1.a, rec1.b;
 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 p1();
 rec1.a	rec1.b
 10	b10
diff --git a/mysql-test/suite/compat/oracle/r/update_innodb.result b/mysql-test/suite/compat/oracle/r/update_innodb.result
index 1dae643eeff..0c9922fe19e 100644
--- a/mysql-test/suite/compat/oracle/r/update_innodb.result
+++ b/mysql-test/suite/compat/oracle/r/update_innodb.result
@@ -6,8 +6,6 @@ CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY) engine=innodb;
 INSERT INTO t1 VALUES (1);
 START TRANSACTION;
 SELECT a AS a_con1 FROM t1 INTO @a FOR UPDATE;
-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
 connect con2,localhost,root,,;
 SET sql_mode='ORACLE';
 START TRANSACTION;
@@ -16,8 +14,6 @@ connection default;
 UPDATE t1 SET a=a+100;
 COMMIT;
 connection con2;
-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 a AS con2 FROM t1;
 con2
 101
diff --git a/mysql-test/suite/engines/funcs/r/rpl_drop_db.result b/mysql-test/suite/engines/funcs/r/rpl_drop_db.result
index 3712527afe4..1b132c20afc 100644
--- a/mysql-test/suite/engines/funcs/r/rpl_drop_db.result
+++ b/mysql-test/suite/engines/funcs/r/rpl_drop_db.result
@@ -6,8 +6,6 @@ create database mysqltest1;
 create table mysqltest1.t1 (n int);
 insert into mysqltest1.t1 values (1);
 select * from mysqltest1.t1 into outfile 'mysqltest1/f1.txt';
-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
 create table mysqltest1.t2 (n int);
 create table mysqltest1.t3 (n int);
 drop database mysqltest1;
diff --git a/mysql-test/suite/engines/funcs/r/rpl_misc_functions.result b/mysql-test/suite/engines/funcs/r/rpl_misc_functions.result
index 302cf2351c2..6c20623d62b 100644
--- a/mysql-test/suite/engines/funcs/r/rpl_misc_functions.result
+++ b/mysql-test/suite/engines/funcs/r/rpl_misc_functions.result
@@ -42,8 +42,6 @@ INSERT INTO t1 (col_a) VALUES (test_replication_sf());
 INSERT INTO t1 (col_a) VALUES (test_replication_sf());
 connection slave;
 select * from t1 into outfile "../../tmp/t1_slave.txt";
-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
 connection master;
 create temporary table t1_slave select * from t1 where 1=0;
 load data infile '../../tmp/t1_slave.txt' into table t1_slave;
diff --git a/mysql-test/suite/handler/aria.result b/mysql-test/suite/handler/aria.result
index b0a4a173289..abed2cfccc7 100644
--- a/mysql-test/suite/handler/aria.result
+++ b/mysql-test/suite/handler/aria.result
@@ -1540,8 +1540,6 @@ BEGIN
 SELECT 1 FROM t2 INTO @a;
 RETURN 1;
 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
 SELECT f1();
 ERROR 42S02: Table 'test.t2' doesn't exist
 CREATE TABLE t1(a INT);
diff --git a/mysql-test/suite/handler/heap.result b/mysql-test/suite/handler/heap.result
index e66bccb1341..75355ba029c 100644
--- a/mysql-test/suite/handler/heap.result
+++ b/mysql-test/suite/handler/heap.result
@@ -1539,8 +1539,6 @@ BEGIN
 SELECT 1 FROM t2 INTO @a;
 RETURN 1;
 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
 SELECT f1();
 ERROR 42S02: Table 'test.t2' doesn't exist
 CREATE TABLE t1(a INT);
diff --git a/mysql-test/suite/handler/innodb.result b/mysql-test/suite/handler/innodb.result
index 5d44642db01..5305a80ab9e 100644
--- a/mysql-test/suite/handler/innodb.result
+++ b/mysql-test/suite/handler/innodb.result
@@ -1544,8 +1544,6 @@ BEGIN
 SELECT 1 FROM t2 INTO @a;
 RETURN 1;
 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
 SELECT f1();
 ERROR 42S02: Table 'test.t2' doesn't exist
 CREATE TABLE t1(a INT);
diff --git a/mysql-test/suite/handler/myisam.result b/mysql-test/suite/handler/myisam.result
index cc817ccd889..94c3791d837 100644
--- a/mysql-test/suite/handler/myisam.result
+++ b/mysql-test/suite/handler/myisam.result
@@ -1540,8 +1540,6 @@ BEGIN
 SELECT 1 FROM t2 INTO @a;
 RETURN 1;
 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
 SELECT f1();
 ERROR 42S02: Table 'test.t2' doesn't exist
 CREATE TABLE t1(a INT);
diff --git a/mysql-test/suite/innodb/r/innodb_bug30919.result b/mysql-test/suite/innodb/r/innodb_bug30919.result
index 0062df3f470..42aa4ff302b 100644
--- a/mysql-test/suite/innodb/r/innodb_bug30919.result
+++ b/mysql-test/suite/innodb/r/innodb_bug30919.result
@@ -35,10 +35,6 @@ FROM test.part_tbl;                           -- debug to show the problem
 SET del_count = del_count - 2;
 END WHILE;
 END|
-Warnings:
-Level	Warning
-Code	1287
-Message	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
 CALL test.proc_part();
 internal_count	del_count
 999	1000
diff --git a/mysql-test/suite/innodb/r/innodb_bug51920.result b/mysql-test/suite/innodb/r/innodb_bug51920.result
index 9bc35174979..ddb9e29fab2 100644
--- a/mysql-test/suite/innodb/r/innodb_bug51920.result
+++ b/mysql-test/suite/innodb/r/innodb_bug51920.result
@@ -11,8 +11,6 @@ connection default;
 SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST
 WHERE INFO="UPDATE bug51920 SET i=2"
 INTO @thread_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
 KILL @thread_id;
 connection con1;
 Got one of the listed errors
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/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
diff --git a/mysql-test/suite/rpl/r/rpl_drop_db.result b/mysql-test/suite/rpl/r/rpl_drop_db.result
index 3712527afe4..1b132c20afc 100644
--- a/mysql-test/suite/rpl/r/rpl_drop_db.result
+++ b/mysql-test/suite/rpl/r/rpl_drop_db.result
@@ -6,8 +6,6 @@ create database mysqltest1;
 create table mysqltest1.t1 (n int);
 insert into mysqltest1.t1 values (1);
 select * from mysqltest1.t1 into outfile 'mysqltest1/f1.txt';
-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
 create table mysqltest1.t2 (n int);
 create table mysqltest1.t3 (n int);
 drop database mysqltest1;
diff --git a/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result b/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result
index 2ecc3ac159c..063e568f5fa 100644
--- a/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result
+++ b/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result
@@ -51,10 +51,6 @@ DELETE FROM test.regular_tbl WHERE id = del_count;
 SET del_count = del_count - 2;
 END WHILE;
 END|
-Warnings:
-Level	Warning
-Code	1287
-Message	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
 CREATE PROCEDURE test.proc_bykey()
 BEGIN
 DECLARE ins_count INT DEFAULT 1000;
@@ -76,10 +72,6 @@ DELETE FROM test.bykey_tbl WHERE id = del_count;
 SET del_count = del_count - 2;
 END WHILE;
 END|
-Warnings:
-Level	Warning
-Code	1287
-Message	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
 CREATE PROCEDURE test.proc_byrange()
 BEGIN
 DECLARE ins_count INT DEFAULT 1000;
@@ -101,10 +93,6 @@ DELETE FROM test.byrange_tbl WHERE id = del_count;
 SET del_count = del_count - 2;
 END WHILE;
 END|
-Warnings:
-Level	Warning
-Code	1287
-Message	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
 begin;
 CALL test.proc_norm();
 commit;
diff --git a/mysql-test/suite/rpl/r/rpl_innodb_bug30888.result b/mysql-test/suite/rpl/r/rpl_innodb_bug30888.result
index da6888e76a0..d4640a36a7d 100644
--- a/mysql-test/suite/rpl/r/rpl_innodb_bug30888.result
+++ b/mysql-test/suite/rpl/r/rpl_innodb_bug30888.result
@@ -26,10 +26,6 @@ DELETE FROM test.regular_tbl WHERE id = del_count;
 SET del_count = del_count - 2;
 END WHILE;
 END|
-Warnings:
-Level	Warning
-Code	1287
-Message	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
 CALL test.proc_norm();
 connection slave;
 connection master;
diff --git a/mysql-test/suite/rpl/r/rpl_mdev12179.result b/mysql-test/suite/rpl/r/rpl_mdev12179.result
index dcda036cdfb..7cb750dd71c 100644
--- a/mysql-test/suite/rpl/r/rpl_mdev12179.result
+++ b/mysql-test/suite/rpl/r/rpl_mdev12179.result
@@ -259,8 +259,6 @@ connection server_2;
 *** Restart the slave server to prove 'gtid_slave_pos_innodb' autodiscovery ***
 connection server_2;
 SELECT max(seq_no) FROM mysql.gtid_slave_pos_InnoDB into @seq_no;
-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
 connection server_1;
 INSERT INTO t2(a) SELECT 1+MAX(a) FROM t2;
 include/save_master_gtid.inc
diff --git a/mysql-test/suite/rpl/r/rpl_misc_functions.result b/mysql-test/suite/rpl/r/rpl_misc_functions.result
index 302cf2351c2..6c20623d62b 100644
--- a/mysql-test/suite/rpl/r/rpl_misc_functions.result
+++ b/mysql-test/suite/rpl/r/rpl_misc_functions.result
@@ -42,8 +42,6 @@ INSERT INTO t1 (col_a) VALUES (test_replication_sf());
 INSERT INTO t1 (col_a) VALUES (test_replication_sf());
 connection slave;
 select * from t1 into outfile "../../tmp/t1_slave.txt";
-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
 connection master;
 create temporary table t1_slave select * from t1 where 1=0;
 load data infile '../../tmp/t1_slave.txt' into table t1_slave;
diff --git a/mysql-test/suite/sys_vars/r/innodb_fil_make_page_dirty_debug_basic.result b/mysql-test/suite/sys_vars/r/innodb_fil_make_page_dirty_debug_basic.result
index 477eb7fcb61..abf2cdaf1c4 100644
--- a/mysql-test/suite/sys_vars/r/innodb_fil_make_page_dirty_debug_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_fil_make_page_dirty_debug_basic.result
@@ -17,8 +17,6 @@ ERROR HY000: Variable 'innodb_fil_make_page_dirty_debug' is a GLOBAL variable an
 create table t1 (f1 int primary key) engine = innodb;
 select space from information_schema.innodb_sys_tables
 where name = 'test/t1' into @space_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
 set global innodb_saved_page_number_debug = 0;
 set global innodb_fil_make_page_dirty_debug = @space_id;
 drop table t1;
diff --git a/mysql-test/suite/sys_vars/r/innodb_saved_page_number_debug_basic.result b/mysql-test/suite/sys_vars/r/innodb_saved_page_number_debug_basic.result
index b306749dcb0..20e2b78e640 100644
--- a/mysql-test/suite/sys_vars/r/innodb_saved_page_number_debug_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_saved_page_number_debug_basic.result
@@ -17,8 +17,6 @@ ERROR HY000: Variable 'innodb_saved_page_number_debug' is a GLOBAL variable and
 create table t1 (f1 int primary key) engine = innodb;
 select space from information_schema.innodb_sys_tables
 where name = 'test/t1' into @space_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
 set global innodb_saved_page_number_debug = 0;
 set global innodb_fil_make_page_dirty_debug = @space_id;
 drop table t1;
diff --git a/mysql-test/suite/sys_vars/r/secure_file_priv.result b/mysql-test/suite/sys_vars/r/secure_file_priv.result
index 74f816df59d..eeeb9a58c0f 100644
--- a/mysql-test/suite/sys_vars/r/secure_file_priv.result
+++ b/mysql-test/suite/sys_vars/r/secure_file_priv.result
@@ -6,8 +6,6 @@ INSERT INTO t1 VALUES ("one"),("two"),("three"),("four"),("five");
 SHOW VARIABLES LIKE 'secure_file_priv';
 Variable_name	Value
 secure_file_priv	
-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
 c1
 one
 two
diff --git a/mysql-test/suite/versioning/r/alter.result b/mysql-test/suite/versioning/r/alter.result
index 9751f7c718d..7f7323ba47f 100644
--- a/mysql-test/suite/versioning/r/alter.result
+++ b/mysql-test/suite/versioning/r/alter.result
@@ -199,8 +199,6 @@ a
 2
 1
 select row_start from t where a=3 into @tm;
-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
 alter table t add column b int;
 select @tm=row_start from t where a=3;
 @tm=row_start
diff --git a/mysql-test/suite/versioning/r/commit_id.result b/mysql-test/suite/versioning/r/commit_id.result
index 8815613292e..abf2eaf91ba 100644
--- a/mysql-test/suite/versioning/r/commit_id.result
+++ b/mysql-test/suite/versioning/r/commit_id.result
@@ -10,8 +10,6 @@ insert into t1 values ();
 set @ts0= now(6);
 insert into t1 values ();
 select sys_trx_start from t1 where id = last_insert_id() into @tx0;
-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 transaction_id = @tx0 from mysql.transaction_registry
 order by transaction_id desc limit 1;
 transaction_id = @tx0
@@ -19,8 +17,6 @@ transaction_id = @tx0
 set @ts1= now(6);
 insert into t1 values ();
 select sys_trx_start from t1 where id = last_insert_id() into @tx1;
-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 transaction_id = @tx1 from mysql.transaction_registry
 order by transaction_id desc limit 1;
 transaction_id = @tx1
@@ -28,8 +24,6 @@ transaction_id = @tx1
 set @ts2= now(6);
 insert into t1 values ();
 select sys_trx_start from t1 where id = last_insert_id() into @tx2;
-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 transaction_id = @tx2 from mysql.transaction_registry
 order by transaction_id desc limit 1;
 transaction_id = @tx2
@@ -72,32 +66,24 @@ trt_trx_sees(0, @tx2)
 set transaction isolation level read uncommitted;
 insert into t1 values ();
 select sys_trx_start from t1 where id = last_insert_id() into @tx3;
-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 isolation_level = 'READ-UNCOMMITTED' from mysql.transaction_registry where transaction_id = @tx3;
 isolation_level = 'READ-UNCOMMITTED'
 1
 set transaction isolation level read committed;
 insert into t1 values ();
 select sys_trx_start from t1 where id = last_insert_id() into @tx4;
-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 isolation_level = 'READ-COMMITTED' from mysql.transaction_registry where transaction_id = @tx4;
 isolation_level = 'READ-COMMITTED'
 1
 set transaction isolation level serializable;
 insert into t1 values ();
 select sys_trx_start from t1 where id = last_insert_id() into @tx5;
-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 isolation_level = 'SERIALIZABLE' from mysql.transaction_registry where transaction_id = @tx5;
 isolation_level = 'SERIALIZABLE'
 1
 set transaction isolation level repeatable read;
 insert into t1 values ();
 select sys_trx_start from t1 where id = last_insert_id() into @tx6;
-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 isolation_level = 'REPEATABLE-READ' from mysql.transaction_registry where transaction_id = @tx6;
 isolation_level = 'REPEATABLE-READ'
 1
diff --git a/mysql-test/suite/versioning/r/create.result b/mysql-test/suite/versioning/r/create.result
index c9d68f15e57..158f0b7faf3 100644
--- a/mysql-test/suite/versioning/r/create.result
+++ b/mysql-test/suite/versioning/r/create.result
@@ -271,12 +271,8 @@ t3	CREATE TABLE `t3` (
 ## For versioned table
 insert into t1 values (1);
 select row_start from t1 into @row_start;
-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
 insert into t0 (y) values (2);
 select st from t0 into @st;
-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
 create or replace table t2 with system versioning as select * from t1;
 show create table t2;
 Table	Create Table
@@ -339,12 +335,8 @@ ERROR 42S21: Duplicate column name 'row_end'
 # Prepare checking for historical row
 delete from t1;
 select row_end from t1 for system_time all into @row_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
 delete from t0;
 select en from t0 for system_time all into @en;
-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
 ## Combinations of versioned + non-versioned
 create or replace table t2 (y int);
 insert into t2 values (3);
@@ -365,14 +357,10 @@ insert into t2 (y) values (1), (2);
 delete from t2 where y = 2;
 create or replace table t3 select * from t2 for system_time all;
 select st, en from t3 where y = 1 into @st, @en;
-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 y from t2 for system_time all where st = @st and en = @en;
 y
 1
 select st, en from t3 where y = 2 into @st, @en;
-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 y from t2 for system_time all where st = @st and en = @en;
 y
 2
diff --git a/mysql-test/suite/versioning/r/foreign.result b/mysql-test/suite/versioning/r/foreign.result
index b17deba1c1e..7c8d9577096 100644
--- a/mysql-test/suite/versioning/r/foreign.result
+++ b/mysql-test/suite/versioning/r/foreign.result
@@ -274,8 +274,6 @@ on update cascade
 ) engine=innodb;
 insert into parent (value) values (23);
 select id, value from parent into @id, @value;
-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
 insert into child values (default, @id, @value);
 insert into subchild values (default, @id, @value);
 select parent_id from subchild;
diff --git a/mysql-test/suite/versioning/r/insert.result b/mysql-test/suite/versioning/r/insert.result
index 442d71c6a91..fab71b9f1cc 100644
--- a/mysql-test/suite/versioning/r/insert.result
+++ b/mysql-test/suite/versioning/r/insert.result
@@ -54,8 +54,6 @@ drop view vt1_1;
 create or replace table t1( id bigint primary key, a int, b int) with system versioning;
 insert into t1 values(1, 1, 1);
 select row_start, row_end from t1 into @sys_start, @sys_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
 select id, a, b from t1;
 id	a	b
 1	1	1
diff --git a/mysql-test/suite/versioning/r/load_data.result b/mysql-test/suite/versioning/r/load_data.result
index 1fcde73e565..5e7b36c9a6a 100644
--- a/mysql-test/suite/versioning/r/load_data.result
+++ b/mysql-test/suite/versioning/r/load_data.result
@@ -1,8 +1,6 @@
 CREATE TABLE t1 (a INT, b INT, c INT, vc INT AS (c), UNIQUE(a), UNIQUE(b)) WITH SYSTEM VERSIONING;
 INSERT IGNORE INTO t1 (a,b,c) VALUES (1,2,3);
 SELECT a, b, c FROM t1 INTO OUTFILE '15330.data';
-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
 LOAD DATA INFILE '15330.data' IGNORE INTO TABLE t1 (a,b,c);
 Warnings:
 Warning	1062	Duplicate entry '1' for key 'a'
diff --git a/mysql-test/suite/versioning/r/partition.result b/mysql-test/suite/versioning/r/partition.result
index febb19bf48e..3656db2fe06 100644
--- a/mysql-test/suite/versioning/r/partition.result
+++ b/mysql-test/suite/versioning/r/partition.result
@@ -178,8 +178,6 @@ x	C	D
 1	1	1
 set @str= concat('select row_start from t1 partition (pn) into @ts0');
 prepare stmt from @str;
-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
 execute stmt;
 drop prepare stmt;
 set @now= now(6);
@@ -191,8 +189,6 @@ execute select_pn;
 x	C	D
 set @str= concat('select row_start from t1 partition (p0) into @ts1');
 prepare stmt from @str;
-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
 execute stmt;
 drop prepare stmt;
 select @ts0 = @ts1;
@@ -208,8 +204,6 @@ x	C	D
 2	1	1
 set @str= concat('select row_start from t1 partition (pn) into @ts0');
 prepare stmt from @str;
-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
 execute stmt;
 drop prepare stmt;
 set @now= now(6);
@@ -225,20 +219,14 @@ drop prepare select_p0;
 drop prepare select_pn;
 set @str= concat('select row_start from t1 partition (p0) where x = 2 into @ts1');
 prepare stmt from @str;
-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
 execute stmt;
 drop prepare stmt;
 set @str= concat('select row_end from t1 partition (p0) where x = 2 into @ts2');
 prepare stmt from @str;
-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
 execute stmt;
 drop prepare stmt;
 set @str= concat('select row_start from t1 partition (pn) into @ts3');
 prepare stmt from @str;
-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
 execute stmt;
 drop prepare stmt;
 select @ts0 = @ts1;
@@ -821,8 +809,6 @@ create or replace table t2 (f int);
 create or replace trigger tr before insert on t2
 for each row select table_rows from information_schema.tables
 where table_name = 't1' into @a;
-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
 insert into t2 values (1);
 #
 # MDEV-14740 Locking assertion for system_time partitioning
@@ -832,8 +818,6 @@ partition by system_time interval 1 week;
 create or replace table t2 (f int);
 create or replace trigger tr before insert on t2
 for each row select count(*) from t1 into @a;
-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
 insert into t2 values (1);
 #
 # MDEV-14747 ALTER PARTITION BY SYSTEM_TIME after LOCK TABLES
diff --git a/mysql-test/suite/versioning/r/select,trx_id.rdiff b/mysql-test/suite/versioning/r/select,trx_id.rdiff
index 1b879493475..e69de29bb2d 100644
--- a/mysql-test/suite/versioning/r/select,trx_id.rdiff
+++ b/mysql-test/suite/versioning/r/select,trx_id.rdiff
@@ -1,11 +0,0 @@
---- select.result
-+++ select.reject
-@@ -17,6 +17,8 @@
- (8, 108),
- (9, 109);
- set @t0= now(6);
-+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
- delete from t1 where x = 3;
- delete from t1 where x > 7;
- insert into t1(x, y) values(3, 33);
diff --git a/mysql-test/suite/versioning/r/select.result b/mysql-test/suite/versioning/r/select.result
index 90c99d1bf0e..9841b4dedbb 100644
--- a/mysql-test/suite/versioning/r/select.result
+++ b/mysql-test/suite/versioning/r/select.result
@@ -23,8 +23,6 @@ delete from t1 where x = 3;
 delete from t1 where x > 7;
 insert into t1(x, y) values(3, 33);
 select sys_trx_start from t1 where x = 3 and y = 33 into @t1;
-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 x, y from t1;
 x	y
 0	100
@@ -382,8 +380,6 @@ insert into t1 values (1);
 set @ts= now(6);
 delete from t1;
 select sys_trx_start from t1 for system_time all into @trx_start;
-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
 ## ensure @trx_start is much lower than unix timestamp
 select @trx_start < unix_timestamp(@ts) - 100 as trx_start_good;
 trx_start_good
@@ -577,11 +573,7 @@ period for system_time (row_start, row_end)
 insert into t1 values (1);
 delete from t1;
 select row_start from t1 for system_time all into @t1;
-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 row_end from t1 for system_time all into @t2;
-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 * from t1 for system_time between @t1 and @t2;
 a
 1
diff --git a/mysql-test/suite/versioning/r/select2,trx_id.rdiff b/mysql-test/suite/versioning/r/select2,trx_id.rdiff
index 085a2a12653..45555385c31 100644
--- a/mysql-test/suite/versioning/r/select2,trx_id.rdiff
+++ b/mysql-test/suite/versioning/r/select2,trx_id.rdiff
@@ -1,15 +1,15 @@
---- select2.result
-+++ select2,trx_id.reject
-@@ -26,6 +26,8 @@
+--- suite/versioning/r/select2.result	2022-12-12 19:34:34.242342915 +0200
++++ suite/versioning/r/select2,trx_id.reject	2022-12-12 19:37:18.721907294 +0200
+@@ -22,6 +22,8 @@
+ delete from t1 where x > 7;
+ insert into t1(x, y) values(3, 33);
  select sys_start from t1 where x = 3 and y = 33 into @t1;
- 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
 +set @x1= @t1;
 +select trt_commit_ts(@x1) into @t1;
  select x, y from t1;
  x	y
  0	100
-@@ -86,7 +88,7 @@
+@@ -82,7 +84,7 @@
  8	108
  9	109
  3	33
@@ -18,7 +18,7 @@
  ASOF2_x	y
  0	100
  1	101
-@@ -98,7 +100,7 @@
+@@ -94,7 +96,7 @@
  7	107
  8	108
  9	109
@@ -27,7 +27,7 @@
  FROMTO2_x	y
  0	100
  1	101
-@@ -110,7 +112,7 @@
+@@ -106,7 +108,7 @@
  7	107
  8	108
  9	109
diff --git a/mysql-test/suite/versioning/r/select2.result b/mysql-test/suite/versioning/r/select2.result
index 353bdf8e696..613fe86e668 100644
--- a/mysql-test/suite/versioning/r/select2.result
+++ b/mysql-test/suite/versioning/r/select2.result
@@ -18,14 +18,10 @@ insert into t1 (x, y) values
 (9, 109);
 set @t0= now(6);
 select sys_start from t1 limit 1 into @x0;
-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
 delete from t1 where x = 3;
 delete from t1 where x > 7;
 insert into t1(x, y) values(3, 33);
 select sys_start from t1 where x = 3 and y = 33 into @t1;
-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 x, y from t1;
 x	y
 0	100
diff --git a/mysql-test/suite/versioning/r/trx_id.result b/mysql-test/suite/versioning/r/trx_id.result
index 9beec414fbb..d9abbe9cc54 100644
--- a/mysql-test/suite/versioning/r/trx_id.result
+++ b/mysql-test/suite/versioning/r/trx_id.result
@@ -25,15 +25,11 @@ add period for system_time(s, e),
 add system versioning,
 algorithm=inplace;
 select s from t1 into @trx_start;
-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 count(*) = 1 from mysql.transaction_registry where transaction_id = @trx_start;
 count(*) = 1
 1
 create or replace table t1 (x int);
 select count(*) from mysql.transaction_registry into @tmp;
-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
 alter table t1
 add column s bigint unsigned as row start,
 add column e bigint unsigned as row end,
@@ -52,15 +48,11 @@ add period for system_time(s, e),
 add system versioning,
 algorithm=copy;
 select s from t1 into @trx_start;
-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 count(*) = 1 from mysql.transaction_registry where transaction_id = @trx_start;
 count(*) = 1
 1
 create or replace table t1 (x int);
 select count(*) from mysql.transaction_registry into @tmp;
-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
 alter table t1
 add column s bigint unsigned as row start,
 add column e bigint unsigned as row end,
@@ -113,14 +105,8 @@ set @ts2= sysdate(6);
 commit;
 set @ts3= sysdate(6);
 select sys_start from t1 where x = 1 into @trx_id1;
-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 sys_start from t1 where x = 2 into @trx_id2;
-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 sys_start from t1 where x = 3 into @trx_id3;
-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 @trx_id1 < @trx_id2, @trx_id2 < @trx_id3;
 @trx_id1 < @trx_id2	@trx_id2 < @trx_id3
 1	1
@@ -278,8 +264,6 @@ set @ts1= now(6);
 insert into t1 values (1);
 commit;
 select row_start from t1 into @trx_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 trt_begin_ts(@trx_id) <= @ts1 as BEGIN_TS_GOOD;
 BEGIN_TS_GOOD
 1
-- 
cgit v1.2.1