Merge branch '10.2' into bb-10.2-mdev9543

- Make Window Functions errors use the MariaDB's extra error range.
- Fix a trivial bug in check_error_mesg

1 files changed, 0 insertions, 4 deletions

diff --git a/mysql-test/t/sp_notembedded.test b/mysql-test/t/sp_notembedded.test
index d7aaaa4340f..c620f415e22 100644
--- a/mysql-test/t/sp_notembedded.test
+++ b/mysql-test/t/sp_notembedded.test
@@ -331,7 +331,6 @@ FLUSH PRIVILEGES;
 --echo #
 SELECT GET_LOCK('Bug44521', 0);
 --connect (con1,localhost,root,,)
---echo ** Connection con1
 delimiter $;
 CREATE PROCEDURE p()
 BEGIN
@@ -342,7 +341,6 @@ END$
 delimiter ;$
 --send CALL p();
 --connection default
---echo ** Default connection
 let $wait_condition=
   SELECT count(*) = 1 FROM information_schema.processlist
   WHERE state = "User lock" AND info = "SELECT GET_LOCK('Bug44521', 100)";
@@ -420,14 +418,12 @@ use `my.db`;
 
 CREATE FUNCTION f1(a int) RETURNS INT RETURN a;
 
---echo # Create new connection.
 connect (addcon, localhost, root,,);
 connection addcon;
 USE `my.db`;
 SELECT f1(1);
 SELECT `my.db`.f1(2);
 
---echo # Switching to default connection.
 connection default;
 disconnect addcon;
 DROP DATABASE `my.db`;