Merge 10.0 into 10.1

3 files changed, 67 insertions, 6 deletions

diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result
index d203c3d99bd..35d9e97a380 100644
--- a/mysql-test/r/alter_table.result
+++ b/mysql-test/r/alter_table.result
@@ -2101,6 +2101,27 @@ Note	1061	Duplicate key name 'id1'
 DROP TABLE t2;
 DROP TABLE t1;
 #
+# MDEV-6390 CONVERT TO CHARACTER SET utf8 doesn't change DEFAULT CHARSET.
+#
+CREATE TABLE t1 (id int(11) NOT NULL, a int(11) NOT NULL, b int(11))
+ENGINE=InnoDB DEFAULT CHARSET=latin1;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `id` int(11) NOT NULL,
+  `a` int(11) NOT NULL,
+  `b` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+ALTER TABLE t1 CONVERT TO CHARACTER SET utf8;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `id` int(11) NOT NULL,
+  `a` int(11) NOT NULL,
+  `b` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8
+DROP TABLE t1;
+#
 # Start of 10.1 tests
 #
 #
diff --git a/mysql-test/r/contributors.result b/mysql-test/r/contributors.result
index f3f5e227d3a..4a26d0f19dd 100644
--- a/mysql-test/r/contributors.result
+++ b/mysql-test/r/contributors.result
@@ -1,15 +1,17 @@
 SHOW CONTRIBUTORS;
 Name	Location	Comment
-Booking.com	http://www.booking.com	Founding member, Platinum Sponsor of the MariaDB Foundation
+Booking.com	https://www.booking.com	Founding member, Platinum Sponsor of the MariaDB Foundation
+Alibaba Cloud	https://intl.aliyun.com	Platinum Sponsor of the MariaDB Foundation
 MariaDB Corporation	https://mariadb.com	Founding member, Gold Sponsor of the MariaDB Foundation
-Visma	http://visma.com	Gold Sponsor of the MariaDB Foundation
-DBS	http://dbs.com	Gold Sponsor of the MariaDB Foundation
+Visma	https://visma.com	Gold Sponsor of the MariaDB Foundation
+DBS	https://dbs.com	Gold Sponsor of the MariaDB Foundation
 Nexedi	https://www.nexedi.com	Silver Sponsor of the MariaDB Foundation
 Acronis	http://www.acronis.com	Silver Sponsor of the MariaDB Foundation
 Auttomattic	https://automattic.com	Bronze Sponsor of the MariaDB Foundation
-Verkkokauppa.com	https://virtuozzo.com	Bronze Sponsor of the MariaDB Foundation
-Virtuozzo	https://virtuozzo.com/	Bronze Sponsor of the MariaDB Foundation
-Tencent Game DBA	http://tencentdba.com/about/	Bronze Sponsor of the MariaDB Foundation
+Verkkokauppa.com	https://www.verkkokauppa.com	Bronze Sponsor of the MariaDB Foundation
+Virtuozzo	https://virtuozzo.com	Bronze Sponsor of the MariaDB Foundation
+Tencent Game DBA	http://tencentdba.com/about	Bronze Sponsor of the MariaDB Foundation
+Tencent TDSQL	http://tdsql.org	Bronze Sponsor of the MariaDB Foundation
 Google	USA	Sponsoring encryption, parallel replication and GTID
 Facebook	USA	Sponsoring non-blocking API, LIMIT ROWS EXAMINED etc
 Ronald Bradford	Brisbane, Australia	EFF contribution for UC2006 Auction
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index 4142fc0b796..d9b5dfd5a1f 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -7955,6 +7955,44 @@ set global table_open_cache= @tmp_toc;
 set global table_definition_cache= @tmp_tdc;
 drop procedure p1;
 drop table t1,t2,t3,t4,t5,t6;
+#
+# MDEV-11935: Queries in stored procedures with and
+# EXISTS(SELECT * FROM VIEW) crashes and closes hte conneciton.
+#
+CREATE TABLE ANY_TABLE (
+ENTITY_UID    BIGINT NOT NULL
+);
+CREATE TABLE SECURITY_PATH(
+origid BIGINT UNSIGNED NOT NULL,
+destid BIGINT UNSIGNED NOT NULL,
+KEY (destid)
+);
+CREATE VIEW ENTITY_ACCESS (
+ENTITY_UID,
+OWNER_UID
+) AS
+SELECT SP1.origid,
+SP2.destid
+FROM SECURITY_PATH SP1
+JOIN SECURITY_PATH SP2 ON SP1.destid = SP2.origid
+;
+CREATE PROCEDURE SP_EXAMPLE_SELECT ()
+BEGIN
+SELECT *
+FROM ANY_TABLE AT1
+WHERE EXISTS ( SELECT *
+FROM ENTITY_ACCESS EA
+WHERE AT1.ENTITY_UID = EA.ENTITY_UID
+AND   EA.OWNER_UID IS NULL );
+END
+//
+CALL SP_EXAMPLE_SELECT ();
+ENTITY_UID
+CALL SP_EXAMPLE_SELECT ();
+ENTITY_UID
+drop procedure SP_EXAMPLE_SELECT;
+drop view ENTITY_ACCESS;
+drop table ANY_TABLE, SECURITY_PATH;
 # End of 10.0 test
 CREATE FUNCTION f(f1 VARCHAR(64) COLLATE latin1_german2_ci)
 RETURNS VARCHAR(64)