MDEV-6980 OUT parameters in PREPARE

revert the patch for "out parameters in prepare"

10 files changed, 8 insertions, 318 deletions

diff --git a/mysql-test/include/ps_conv.inc b/mysql-test/include/ps_conv.inc
index dba182e0b3e..2e42542d19a 100644
--- a/mysql-test/include/ps_conv.inc
+++ b/mysql-test/include/ps_conv.inc
@@ -256,14 +256,9 @@ execute stmt1 using @my_key ;
 execute full_info ;
 --disable_metadata
 
-# the next statement does not fail anymore
+# the next statement must fail
+--error 1064
 prepare stmt1 from "select c1 into ? from t9 where c1= 1" ;
-execute stmt1 using @result;
---enable_metadata
-execute full_info ;
---disable_metadata
-select @result;
-
 
 
 
diff --git a/mysql-test/r/compound.result b/mysql-test/r/compound.result
index 76aa3831553..dc1f33147a0 100644
--- a/mysql-test/r/compound.result
+++ b/mysql-test/r/compound.result
@@ -36,16 +36,6 @@ master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (6)
 master-bin.000001	#	Query	#	#	COMMIT
-PREPARE stmt FROM "BEGIN NOT ATOMIC
-  DECLARE v_res INT;
-  SELECT COUNT(*) INTO v_res FROM t1;
-  SELECT 'Hello World', v_res INTO ?,?;
-END"|
-SET @val="", @val2=""|
-EXECUTE stmt USING @val, @val2|
-SELECT @val, @val2|
-@val	@val2
-Hello World	6
 DROP TABLE t1|
 CREATE DATABASE mysqltest1|
 CREATE PROCEDURE mysqltest1.sp1()
diff --git a/mysql-test/r/ps_2myisam.result b/mysql-test/r/ps_2myisam.result
index 75a6b669a40..6ca76191db5 100644
--- a/mysql-test/r/ps_2myisam.result
+++ b/mysql-test/r/ps_2myisam.result
@@ -2265,46 +2265,7 @@ def					@arg32	250	16777215	0	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1991-01-01 01:01:01	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 prepare stmt1 from "select c1 into ? from t9 where c1= 1" ;
-execute stmt1 using @result;
-execute full_info ;
-Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def					@arg01	8	20	1	Y	32896	0	63
-def					@arg02	8	20	0	Y	32896	0	63
-def					@arg03	8	20	0	Y	32896	0	63
-def					@arg04	8	20	0	Y	32896	0	63
-def					@arg05	8	20	0	Y	32896	0	63
-def					@arg06	8	20	0	Y	32896	0	63
-def					@arg07	5	23	0	Y	32896	31	63
-def					@arg08	5	23	0	Y	32896	31	63
-def					@arg09	5	23	0	Y	32896	31	63
-def					@arg10	5	23	0	Y	32896	31	63
-def					@arg11	246	83	0	Y	32896	30	63
-def					@arg12	246	83	0	Y	32896	30	63
-def					@arg13	250	16777215	0	Y	0	31	8
-def					@arg14	250	16777215	0	Y	0	31	8
-def					@arg15	250	16777215	19	Y	0	31	8
-def					@arg16	250	16777215	0	Y	0	31	8
-def					@arg17	8	20	0	Y	32928	0	63
-def					@arg18	8	20	0	Y	32896	0	63
-def					@arg19	8	20	0	Y	32896	0	63
-def					@arg20	250	16777215	0	Y	0	31	8
-def					@arg21	250	16777215	0	Y	0	31	8
-def					@arg22	250	16777215	0	Y	0	31	8
-def					@arg23	250	16777215	0	Y	128	31	63
-def					@arg24	250	16777215	0	Y	0	31	8
-def					@arg25	250	16777215	0	Y	128	31	63
-def					@arg26	250	16777215	0	Y	0	31	8
-def					@arg27	250	16777215	0	Y	128	31	63
-def					@arg28	250	16777215	0	Y	0	31	8
-def					@arg29	250	16777215	0	Y	128	31	63
-def					@arg30	250	16777215	0	Y	0	31	8
-def					@arg31	250	16777215	0	Y	0	31	8
-def					@arg32	250	16777215	0	Y	0	31	8
-@arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
-0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1991-01-01 01:01:01	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-select @result;
-@result
-1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? from t9 where c1= 1' at line 1
 test_sequence
 -- insert into numeric columns --
 insert into t9 
diff --git a/mysql-test/r/ps_3innodb.result b/mysql-test/r/ps_3innodb.result
index 17be5e53418..47237790ae5 100644
--- a/mysql-test/r/ps_3innodb.result
+++ b/mysql-test/r/ps_3innodb.result
@@ -2248,46 +2248,7 @@ def					@arg32	250	16777215	0	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1991-01-01 01:01:01	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 prepare stmt1 from "select c1 into ? from t9 where c1= 1" ;
-execute stmt1 using @result;
-execute full_info ;
-Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def					@arg01	8	20	1	Y	32896	0	63
-def					@arg02	8	20	0	Y	32896	0	63
-def					@arg03	8	20	0	Y	32896	0	63
-def					@arg04	8	20	0	Y	32896	0	63
-def					@arg05	8	20	0	Y	32896	0	63
-def					@arg06	8	20	0	Y	32896	0	63
-def					@arg07	5	23	0	Y	32896	31	63
-def					@arg08	5	23	0	Y	32896	31	63
-def					@arg09	5	23	0	Y	32896	31	63
-def					@arg10	5	23	0	Y	32896	31	63
-def					@arg11	246	83	0	Y	32896	30	63
-def					@arg12	246	83	0	Y	32896	30	63
-def					@arg13	250	16777215	0	Y	0	31	8
-def					@arg14	250	16777215	0	Y	0	31	8
-def					@arg15	250	16777215	19	Y	0	31	8
-def					@arg16	250	16777215	0	Y	0	31	8
-def					@arg17	8	20	0	Y	32928	0	63
-def					@arg18	8	20	0	Y	32896	0	63
-def					@arg19	8	20	0	Y	32896	0	63
-def					@arg20	250	16777215	0	Y	0	31	8
-def					@arg21	250	16777215	0	Y	0	31	8
-def					@arg22	250	16777215	0	Y	0	31	8
-def					@arg23	250	16777215	0	Y	128	31	63
-def					@arg24	250	16777215	0	Y	0	31	8
-def					@arg25	250	16777215	0	Y	128	31	63
-def					@arg26	250	16777215	0	Y	0	31	8
-def					@arg27	250	16777215	0	Y	128	31	63
-def					@arg28	250	16777215	0	Y	0	31	8
-def					@arg29	250	16777215	0	Y	128	31	63
-def					@arg30	250	16777215	0	Y	0	31	8
-def					@arg31	250	16777215	0	Y	0	31	8
-def					@arg32	250	16777215	0	Y	0	31	8
-@arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
-0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1991-01-01 01:01:01	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-select @result;
-@result
-1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? from t9 where c1= 1' at line 1
 test_sequence
 -- insert into numeric columns --
 insert into t9 
diff --git a/mysql-test/r/ps_4heap.result b/mysql-test/r/ps_4heap.result
index 5c0f01788a6..57532797dd7 100644
--- a/mysql-test/r/ps_4heap.result
+++ b/mysql-test/r/ps_4heap.result
@@ -2249,46 +2249,7 @@ def					@arg32	250	16777215	0	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1991-01-01 01:01:01	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 prepare stmt1 from "select c1 into ? from t9 where c1= 1" ;
-execute stmt1 using @result;
-execute full_info ;
-Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def					@arg01	8	20	1	Y	32896	0	63
-def					@arg02	8	20	0	Y	32896	0	63
-def					@arg03	8	20	0	Y	32896	0	63
-def					@arg04	8	20	0	Y	32896	0	63
-def					@arg05	8	20	0	Y	32896	0	63
-def					@arg06	8	20	0	Y	32896	0	63
-def					@arg07	5	23	0	Y	32896	31	63
-def					@arg08	5	23	0	Y	32896	31	63
-def					@arg09	5	23	0	Y	32896	31	63
-def					@arg10	5	23	0	Y	32896	31	63
-def					@arg11	246	83	0	Y	32896	30	63
-def					@arg12	246	83	0	Y	32896	30	63
-def					@arg13	250	16777215	0	Y	0	31	8
-def					@arg14	250	16777215	0	Y	0	31	8
-def					@arg15	250	16777215	19	Y	0	31	8
-def					@arg16	250	16777215	0	Y	0	31	8
-def					@arg17	8	20	0	Y	32928	0	63
-def					@arg18	8	20	0	Y	32896	0	63
-def					@arg19	8	20	0	Y	32896	0	63
-def					@arg20	250	16777215	0	Y	0	31	8
-def					@arg21	250	16777215	0	Y	0	31	8
-def					@arg22	250	16777215	0	Y	0	31	8
-def					@arg23	250	16777215	0	Y	0	31	8
-def					@arg24	250	16777215	0	Y	0	31	8
-def					@arg25	250	16777215	0	Y	0	31	8
-def					@arg26	250	16777215	0	Y	0	31	8
-def					@arg27	250	16777215	0	Y	0	31	8
-def					@arg28	250	16777215	0	Y	0	31	8
-def					@arg29	250	16777215	0	Y	0	31	8
-def					@arg30	250	16777215	0	Y	0	31	8
-def					@arg31	250	16777215	0	Y	0	31	8
-def					@arg32	250	16777215	0	Y	0	31	8
-@arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
-0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1991-01-01 01:01:01	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-select @result;
-@result
-1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? from t9 where c1= 1' at line 1
 test_sequence
 -- insert into numeric columns --
 insert into t9 
diff --git a/mysql-test/r/ps_5merge.result b/mysql-test/r/ps_5merge.result
index 861dba2bd04..9a9f457a212 100644
--- a/mysql-test/r/ps_5merge.result
+++ b/mysql-test/r/ps_5merge.result
@@ -2185,46 +2185,7 @@ def					@arg32	250	16777215	0	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1991-01-01 01:01:01	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 prepare stmt1 from "select c1 into ? from t9 where c1= 1" ;
-execute stmt1 using @result;
-execute full_info ;
-Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def					@arg01	8	20	1	Y	32896	0	63
-def					@arg02	8	20	0	Y	32896	0	63
-def					@arg03	8	20	0	Y	32896	0	63
-def					@arg04	8	20	0	Y	32896	0	63
-def					@arg05	8	20	0	Y	32896	0	63
-def					@arg06	8	20	0	Y	32896	0	63
-def					@arg07	5	23	0	Y	32896	31	63
-def					@arg08	5	23	0	Y	32896	31	63
-def					@arg09	5	23	0	Y	32896	31	63
-def					@arg10	5	23	0	Y	32896	31	63
-def					@arg11	246	83	0	Y	32896	30	63
-def					@arg12	246	83	0	Y	32896	30	63
-def					@arg13	250	16777215	0	Y	0	31	8
-def					@arg14	250	16777215	0	Y	0	31	8
-def					@arg15	250	16777215	19	Y	0	31	8
-def					@arg16	250	16777215	0	Y	0	31	8
-def					@arg17	8	20	0	Y	32928	0	63
-def					@arg18	8	20	0	Y	32896	0	63
-def					@arg19	8	20	0	Y	32896	0	63
-def					@arg20	250	16777215	0	Y	0	31	8
-def					@arg21	250	16777215	0	Y	0	31	8
-def					@arg22	250	16777215	0	Y	0	31	8
-def					@arg23	250	16777215	0	Y	128	31	63
-def					@arg24	250	16777215	0	Y	0	31	8
-def					@arg25	250	16777215	0	Y	128	31	63
-def					@arg26	250	16777215	0	Y	0	31	8
-def					@arg27	250	16777215	0	Y	128	31	63
-def					@arg28	250	16777215	0	Y	0	31	8
-def					@arg29	250	16777215	0	Y	128	31	63
-def					@arg30	250	16777215	0	Y	0	31	8
-def					@arg31	250	16777215	0	Y	0	31	8
-def					@arg32	250	16777215	0	Y	0	31	8
-@arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
-0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1991-01-01 01:01:01	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-select @result;
-@result
-1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? from t9 where c1= 1' at line 1
 test_sequence
 -- insert into numeric columns --
 insert into t9 
@@ -5578,46 +5539,7 @@ def					@arg32	250	16777215	0	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1991-01-01 01:01:01	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 prepare stmt1 from "select c1 into ? from t9 where c1= 1" ;
-execute stmt1 using @result;
-execute full_info ;
-Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def					@arg01	8	20	1	Y	32896	0	63
-def					@arg02	8	20	0	Y	32896	0	63
-def					@arg03	8	20	0	Y	32896	0	63
-def					@arg04	8	20	0	Y	32896	0	63
-def					@arg05	8	20	0	Y	32896	0	63
-def					@arg06	8	20	0	Y	32896	0	63
-def					@arg07	5	23	0	Y	32896	31	63
-def					@arg08	5	23	0	Y	32896	31	63
-def					@arg09	5	23	0	Y	32896	31	63
-def					@arg10	5	23	0	Y	32896	31	63
-def					@arg11	246	83	0	Y	32896	30	63
-def					@arg12	246	83	0	Y	32896	30	63
-def					@arg13	250	16777215	0	Y	0	31	8
-def					@arg14	250	16777215	0	Y	0	31	8
-def					@arg15	250	16777215	19	Y	0	31	8
-def					@arg16	250	16777215	0	Y	0	31	8
-def					@arg17	8	20	0	Y	32928	0	63
-def					@arg18	8	20	0	Y	32896	0	63
-def					@arg19	8	20	0	Y	32896	0	63
-def					@arg20	250	16777215	0	Y	0	31	8
-def					@arg21	250	16777215	0	Y	0	31	8
-def					@arg22	250	16777215	0	Y	0	31	8
-def					@arg23	250	16777215	0	Y	128	31	63
-def					@arg24	250	16777215	0	Y	0	31	8
-def					@arg25	250	16777215	0	Y	128	31	63
-def					@arg26	250	16777215	0	Y	0	31	8
-def					@arg27	250	16777215	0	Y	128	31	63
-def					@arg28	250	16777215	0	Y	0	31	8
-def					@arg29	250	16777215	0	Y	128	31	63
-def					@arg30	250	16777215	0	Y	0	31	8
-def					@arg31	250	16777215	0	Y	0	31	8
-def					@arg32	250	16777215	0	Y	0	31	8
-@arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
-0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1991-01-01 01:01:01	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-select @result;
-@result
-1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? from t9 where c1= 1' at line 1
 test_sequence
 -- insert into numeric columns --
 insert into t9 
diff --git a/mysql-test/suite/maria/ps_maria.result b/mysql-test/suite/maria/ps_maria.result
index 30b877e042c..774bf8af54a 100644
--- a/mysql-test/suite/maria/ps_maria.result
+++ b/mysql-test/suite/maria/ps_maria.result
@@ -2265,46 +2265,7 @@ def					@arg32	250	16777215	0	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1991-01-01 01:01:01	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 prepare stmt1 from "select c1 into ? from t9 where c1= 1" ;
-execute stmt1 using @result;
-execute full_info ;
-Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def					@arg01	8	20	1	Y	32896	0	63
-def					@arg02	8	20	0	Y	32896	0	63
-def					@arg03	8	20	0	Y	32896	0	63
-def					@arg04	8	20	0	Y	32896	0	63
-def					@arg05	8	20	0	Y	32896	0	63
-def					@arg06	8	20	0	Y	32896	0	63
-def					@arg07	5	23	0	Y	32896	31	63
-def					@arg08	5	23	0	Y	32896	31	63
-def					@arg09	5	23	0	Y	32896	31	63
-def					@arg10	5	23	0	Y	32896	31	63
-def					@arg11	246	83	0	Y	32896	30	63
-def					@arg12	246	83	0	Y	32896	30	63
-def					@arg13	250	16777215	0	Y	0	31	8
-def					@arg14	250	16777215	0	Y	0	31	8
-def					@arg15	250	16777215	19	Y	0	31	8
-def					@arg16	250	16777215	0	Y	0	31	8
-def					@arg17	8	20	0	Y	32928	0	63
-def					@arg18	8	20	0	Y	32896	0	63
-def					@arg19	8	20	0	Y	32896	0	63
-def					@arg20	250	16777215	0	Y	0	31	8
-def					@arg21	250	16777215	0	Y	0	31	8
-def					@arg22	250	16777215	0	Y	0	31	8
-def					@arg23	250	16777215	0	Y	128	31	63
-def					@arg24	250	16777215	0	Y	0	31	8
-def					@arg25	250	16777215	0	Y	128	31	63
-def					@arg26	250	16777215	0	Y	0	31	8
-def					@arg27	250	16777215	0	Y	128	31	63
-def					@arg28	250	16777215	0	Y	0	31	8
-def					@arg29	250	16777215	0	Y	128	31	63
-def					@arg30	250	16777215	0	Y	0	31	8
-def					@arg31	250	16777215	0	Y	0	31	8
-def					@arg32	250	16777215	0	Y	0	31	8
-@arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
-0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1991-01-01 01:01:01	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-select @result;
-@result
-1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? from t9 where c1= 1' at line 1
 test_sequence
 -- insert into numeric columns --
 insert into t9 
diff --git a/mysql-test/suite/rpl/r/prepare_select_into.result b/mysql-test/suite/rpl/r/prepare_select_into.result
deleted file mode 100644
index ebf64f24967..00000000000
--- a/mysql-test/suite/rpl/r/prepare_select_into.result
+++ /dev/null
@@ -1,26 +0,0 @@
-include/master-slave.inc
-[connection master]
-create table t1 (a int, b int);
-create table t2 (c int);
-insert t1 values (1, 2), (3, 4);
-create function fn1(x int) returns int deterministic
-begin
-insert t2 values (x);
-return x;
-end|
-prepare stmt1 from "select fn1(a) into ? from t1 where b= 2";
-execute stmt1 using @result;
-select * from t2;
-c
-1
-1
-select @result;
-@result
-1
-select * from t2;
-c
-1
-1
-drop table t1, t2;
-drop function fn1;
-include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/prepare_select_into.test b/mysql-test/suite/rpl/t/prepare_select_into.test
deleted file mode 100644
index 995b81020a1..00000000000
--- a/mysql-test/suite/rpl/t/prepare_select_into.test
+++ /dev/null
@@ -1,27 +0,0 @@
-source include/master-slave.inc;
-
-create table t1 (a int, b int);
-create table t2 (c int);
-insert t1 values (1, 2), (3, 4);
-
-delimiter |;
-create function fn1(x int) returns int deterministic
-begin
-  insert t2 values (x);
-  return x;
-end|
-delimiter ;|
-
-prepare stmt1 from "select fn1(a) into ? from t1 where b= 2";
-execute stmt1 using @result;
-select * from t2;
-select @result;
-sync_slave_with_master;
-select * from t2;
-
-connection master;
-drop table t1, t2;
-drop function fn1;
-
-source include/rpl_end.inc;
-
diff --git a/mysql-test/t/compound.test b/mysql-test/t/compound.test
index 06d09817ac1..1c5d12a1665 100644
--- a/mysql-test/t/compound.test
+++ b/mysql-test/t/compound.test
@@ -28,14 +28,6 @@ delimiter ;|
 source include/show_binlog_events.inc;
 delimiter |;
 
-PREPARE stmt FROM "BEGIN NOT ATOMIC
-  DECLARE v_res INT;
-  SELECT COUNT(*) INTO v_res FROM t1;
-  SELECT 'Hello World', v_res INTO ?,?;
-END"|
-SET @val="", @val2=""|
-EXECUTE stmt USING @val, @val2|
-SELECT @val, @val2|
 DROP TABLE t1|
 
 #