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, 19 insertions, 0 deletions

diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result
index 59f3a6fc5cc..13508716e0f 100644
--- a/mysql-test/r/myisam.result
+++ b/mysql-test/r/myisam.result
@@ -548,7 +548,10 @@ select straight_join * from t1,t2 force index (primary) where t1.a=t2.a;
 a	a	b
 1	1	1
 2	2	1
+connect  root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK;
 insert into t2 values(2,0);
+disconnect root;
+connection default;
 select straight_join * from t1,t2 force index (primary) where t1.a=t2.a;
 a	a	b
 1	1	1
@@ -563,7 +566,11 @@ LOCK TABLES t1 READ LOCAL, t2 READ LOCAL;
 SELECT t1.c1 AS t1c1, t2.c1 AS t2c1 FROM t1, t2
 WHERE t1.c1 = t2.c1 HAVING t1c1 != t2c1;
 t1c1	t2c1
+connect  con1,localhost,root,,;
+connection con1;
 INSERT INTO t2 VALUES ('test000001'), ('test000005');
+disconnect con1;
+connection default;
 SELECT t1.c1 AS t1c1, t2.c1 AS t2c1 FROM t1, t2
 WHERE t1.c1 = t2.c1 HAVING t1c1 != t2c1;
 t1c1	t2c1
@@ -1706,12 +1713,17 @@ set global concurrent_insert=1;
 create table t1 (a int);
 insert into t1 values (1),(2),(3),(4),(5);
 lock table t1 read local;
+connect  con1,localhost,root,,;
+connection con1;
 insert into t1 values(6),(7);
+connection default;
 unlock tables;
 delete from t1 where a>=3 and a<=4;
 lock table t1 read local;
+connection con1;
 set global concurrent_insert=2;
 insert into t1 values (8),(9);
+connection default;
 unlock tables;
 insert into t1 values (10),(11),(12);
 select * from t1;
@@ -1730,15 +1742,21 @@ check table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 drop table t1;
+disconnect con1;
 create table t1 (a int, b varchar(30) default "hello");
 insert into t1 (a) values (1),(2),(3),(4),(5);
 lock table t1 read local;
+connect  con1,localhost,root,,;
+connection con1;
 insert into t1 (a) values(6),(7);
+connection default;
 unlock tables;
 delete from t1 where a>=3 and a<=4;
 lock table t1 read local;
+connection con1;
 set global concurrent_insert=2;
 insert into t1 (a) values (8),(9);
+connection default;
 unlock tables;
 insert into t1 (a) values (10),(11),(12);
 select a from t1;
@@ -1757,6 +1775,7 @@ check table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 drop table t1;
+disconnect con1;
 set global concurrent_insert=@save_concurrent_insert;
 create table t1 (a int, key(a));
 insert into t1 values (1),(2),(3),(4),(NULL),(NULL),(NULL),(NULL);