Merge commit '43882e764d6867c6855b1ff057758a3f08b25c55' into 10.4

23 files changed, 112 insertions, 7 deletions

diff --git a/mysql-test/suite/binlog_encryption/multisource.result b/mysql-test/suite/binlog_encryption/multisource.result
index d99a377f0c5..928c9799854 100644
--- a/mysql-test/suite/binlog_encryption/multisource.result
+++ b/mysql-test/suite/binlog_encryption/multisource.result
@@ -47,6 +47,8 @@ drop database if exists db1;
 create database db1;
 use db1;
 create table t1 (i int auto_increment, f1 varchar(16), primary key pk (i,f1)) engine=MyISAM;
+Warnings:
+Warning	1280	Name 'pk' ignored for PRIMARY key.
 insert into t1 (f1) values ('one'),('two');
 connection slave;
 select * from db1.t1;
diff --git a/mysql-test/suite/compat/oracle/r/column_compression.result b/mysql-test/suite/compat/oracle/r/column_compression.result
index 4eb55f47e51..8f643ad2a06 100644
--- a/mysql-test/suite/compat/oracle/r/column_compression.result
+++ b/mysql-test/suite/compat/oracle/r/column_compression.result
@@ -515,7 +515,7 @@ CREATE TABLE t1 (a TEXT COMPRESSED BYTE);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE "t1" (
-  "a" blob /*!100301 COMPRESSED*/ DEFAULT NULL
+  "a" blob(65535) /*!100301 COMPRESSED*/ DEFAULT NULL
 )
 DROP TABLE t1;
 CREATE TABLE t1 (a TEXT COMPRESSED ASCII);
@@ -547,7 +547,7 @@ CREATE TABLE t1 (a TEXT COMPRESSED BYTE DEFAULT '');
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE "t1" (
-  "a" blob /*!100301 COMPRESSED*/ DEFAULT ''
+  "a" blob(65535) /*!100301 COMPRESSED*/ DEFAULT ''
 )
 DROP TABLE t1;
 CREATE TABLE t1 (a TEXT COMPRESSED BINARY DEFAULT '');
@@ -605,7 +605,7 @@ Warning	1287	'<data type> <character set clause> ... COMPRESSED...' is deprecate
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE "t1" (
-  "a" blob /*!100301 COMPRESSED*/ DEFAULT NULL
+  "a" blob(65535) /*!100301 COMPRESSED*/ DEFAULT NULL
 )
 DROP TABLE t1;
 #
diff --git a/mysql-test/suite/compat/oracle/r/sp.result b/mysql-test/suite/compat/oracle/r/sp.result
index 1d088a98ab7..6bcdf520edb 100644
--- a/mysql-test/suite/compat/oracle/r/sp.result
+++ b/mysql-test/suite/compat/oracle/r/sp.result
@@ -2064,7 +2064,7 @@ t1	CREATE TABLE "t1" (
   "tables_table_name" varchar(64) CHARACTER SET utf8 DEFAULT NULL,
   "tables_table_rows" bigint(21) unsigned DEFAULT NULL,
   "processlist_info" longtext CHARACTER SET utf8 DEFAULT NULL,
-  "processlist_info_binary" blob DEFAULT NULL
+  "processlist_info_binary" blob(65535) DEFAULT NULL
 )
 DROP TABLE t1;
 DROP PROCEDURE p1;
diff --git a/mysql-test/suite/compat/oracle/r/type_blob.result b/mysql-test/suite/compat/oracle/r/type_blob.result
index fe0a78e6ceb..27740947a10 100644
--- a/mysql-test/suite/compat/oracle/r/type_blob.result
+++ b/mysql-test/suite/compat/oracle/r/type_blob.result
@@ -6,3 +6,21 @@ t1	CREATE TABLE "t1" (
   "a" longblob DEFAULT NULL
 )
 DROP TABLE t1;
+#
+# MDEV-20263 sql_mode=ORACLE: BLOB(65535) should not translate to LONGBLOB
+#
+CREATE TABLE t1 (
+c1 BLOB(100),
+c2 BLOB(65535),
+c3 BLOB(16777215),
+c4 BLOB(16777216)
+);
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE "t1" (
+  "c1" tinyblob DEFAULT NULL,
+  "c2" blob(65535) DEFAULT NULL,
+  "c3" mediumblob DEFAULT NULL,
+  "c4" longblob DEFAULT NULL
+)
+DROP TABLE t1;
diff --git a/mysql-test/suite/compat/oracle/t/type_blob.test b/mysql-test/suite/compat/oracle/t/type_blob.test
index 2bfaa77560d..989581ee4f6 100644
--- a/mysql-test/suite/compat/oracle/t/type_blob.test
+++ b/mysql-test/suite/compat/oracle/t/type_blob.test
@@ -2,3 +2,16 @@ SET sql_mode=ORACLE;
 CREATE TABLE t1 (a BLOB);
 SHOW CREATE TABLE t1;
 DROP TABLE t1;
+
+--echo #
+--echo # MDEV-20263 sql_mode=ORACLE: BLOB(65535) should not translate to LONGBLOB
+--echo #
+
+CREATE TABLE t1 (
+  c1 BLOB(100),
+  c2 BLOB(65535),
+  c3 BLOB(16777215),
+  c4 BLOB(16777216)
+);
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
diff --git a/mysql-test/suite/galera/r/GAL-382.result b/mysql-test/suite/galera/r/GAL-382.result
index 137efe4efba..2150326757c 100644
--- a/mysql-test/suite/galera/r/GAL-382.result
+++ b/mysql-test/suite/galera/r/GAL-382.result
@@ -2,8 +2,12 @@ connection node_2;
 connection node_1;
 connection node_1;
 create table t1 (i int, j int, k int, primary key pk(i)) engine=innodb;
+Warnings:
+Warning	1280	Name 'pk' ignored for PRIMARY key.
 insert into t1 values (1, 1, 1), (2, 2, 2), (3, 3, 3);
 create table t2 (i int, j int, k int, primary key pk(i, j, k), index idx(i, k, j)) engine=innodb;
+Warnings:
+Warning	1280	Name 'pk' ignored for PRIMARY key.
 replace into t2 (i, j, k) select /*!99997 */ i, k, j from t1;
 DROP TABLE t1;
 DROP TABLE t2;
diff --git a/mysql-test/suite/innodb/r/innodb-index-online-fk.result b/mysql-test/suite/innodb/r/innodb-index-online-fk.result
index 47fc8e8b840..854afd95aaf 100644
--- a/mysql-test/suite/innodb/r/innodb-index-online-fk.result
+++ b/mysql-test/suite/innodb/r/innodb-index-online-fk.result
@@ -326,6 +326,8 @@ ALTER TABLE child ADD PRIMARY KEY idx (a3), CHANGE a1 a3 INT,
 ADD CONSTRAINT fk_1 FOREIGN KEY (a2) REFERENCES parent(b)
 ON DELETE SET NULL ON UPDATE CASCADE,
 ALGORITHM = INPLACE;
+Warnings:
+Warning	1280	Name 'idx' ignored for PRIMARY key.
 SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_FOREIGN;
 ID	FOR_NAME	REF_NAME	N_COLS	TYPE
 test/fk_1	test/child	test/parent	1	6
@@ -363,6 +365,8 @@ ALTER TABLE child ADD PRIMARY KEY idx (a1),
 ADD CONSTRAINT fk_1 FOREIGN KEY (a2) REFERENCES parent(b)
 ON DELETE SET NULL ON UPDATE CASCADE,
 ALGORITHM = INPLACE;
+Warnings:
+Warning	1280	Name 'idx' ignored for PRIMARY key.
 SELECT * from information_schema.INNODB_SYS_FOREIGN;
 ID	FOR_NAME	REF_NAME	N_COLS	TYPE
 test/fk_1	test/child	test/parent	1	6
@@ -556,6 +560,8 @@ ADD CONSTRAINT fk_new_1 FOREIGN KEY (a1) REFERENCES parent(b),
 ADD CONSTRAINT fk_new_2 FOREIGN KEY (a2) REFERENCES parent(a),
 ADD CONSTRAINT fk_new_3 FOREIGN KEY (a3) REFERENCES parent(a),
 ALGORITHM = INPLACE;
+Warnings:
+Warning	1280	Name 'idx' ignored for PRIMARY key.
 SHOW CREATE TABLE child;
 Table	Create Table
 child	CREATE TABLE `child` (
diff --git a/mysql-test/suite/innodb/r/innodb-virtual-columns.result b/mysql-test/suite/innodb/r/innodb-virtual-columns.result
index bf21e352681..4b2df7eb287 100644
--- a/mysql-test/suite/innodb/r/innodb-virtual-columns.result
+++ b/mysql-test/suite/innodb/r/innodb-virtual-columns.result
@@ -6,6 +6,8 @@ wdraw_rsn varchar(4) NOT NULL DEFAULT '',
 admit_term char(4) NOT NULL DEFAULT '',
 CONSTRAINT gso_grad_supr_pky PRIMARY KEY (uw_id, term) 
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+Warnings:
+Warning	1280	Name 'gso_grad_supr_pky' ignored for PRIMARY key.
 INSERT INTO `gso_grad_supr` VALUES ('1031',2,'CSM','','1009');
 INSERT INTO `gso_grad_supr` VALUES ('1035',2,'CSM','ACAD','1009');
 CREATE TABLE IF NOT EXISTS grad_degree (
@@ -23,6 +25,8 @@ deg_start_term char(4) NOT NULL DEFAULT '' COMMENT 'Educated guess at the beginn
 deg_as_of_term char(4) NOT NULL COMMENT 'In most cases also end term', 
 CONSTRAINT grad_degree_stu_plan_admit_pky PRIMARY KEY (student_id, plan, admit_term)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+Warnings:
+Warning	1280	Name 'grad_degree_stu_plan_admit_pky' ignored for PRIMARY key.
 SHOW CREATE TABLE grad_degree;
 Table	Create Table
 grad_degree	CREATE TABLE `grad_degree` (
@@ -129,6 +133,8 @@ deg_start_term char(4) NOT NULL DEFAULT '' COMMENT 'Educated guess at the beginn
 deg_as_of_term char(4) NOT NULL COMMENT 'In most cases also end term', 
 CONSTRAINT grad_degree_stu_plan_admit_pky PRIMARY KEY (student_id, plan, admit_term)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+Warnings:
+Warning	1280	Name 'grad_degree_stu_plan_admit_pky' ignored for PRIMARY key.
 SHOW CREATE TABLE grad_degree;
 Table	Create Table
 grad_degree	CREATE TABLE `grad_degree` (
@@ -263,6 +269,8 @@ deg_start_term char(4) NOT NULL DEFAULT '' COMMENT 'Educated guess at the beginn
 deg_as_of_term char(4) NOT NULL COMMENT 'In most cases also end term', 
 CONSTRAINT grad_degree_stu_plan_admit_pky PRIMARY KEY (student_id, plan, admit_term)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+Warnings:
+Warning	1280	Name 'grad_degree_stu_plan_admit_pky' ignored for PRIMARY key.
 SHOW CREATE TABLE grad_degree;
 Table	Create Table
 grad_degree	CREATE TABLE `grad_degree` (
diff --git a/mysql-test/suite/innodb/r/innodb_bug51378.result b/mysql-test/suite/innodb/r/innodb_bug51378.result
index 532fd703af6..2ffd533279b 100644
--- a/mysql-test/suite/innodb/r/innodb_bug51378.result
+++ b/mysql-test/suite/innodb/r/innodb_bug51378.result
@@ -28,6 +28,8 @@ bug51378	CREATE TABLE `bug51378` (
   UNIQUE KEY `idx2` (`col1`,`col2`(31))
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 alter table bug51378 add primary key idx3(col1, col2(31));
+Warnings:
+Warning	1280	Name 'idx3' ignored for PRIMARY key.
 SHOW CREATE TABLE bug51378;
 Table	Create Table
 bug51378	CREATE TABLE `bug51378` (
diff --git a/mysql-test/suite/innodb/r/innodb_bug60229.result b/mysql-test/suite/innodb/r/innodb_bug60229.result
index a3971876193..588f3855764 100644
--- a/mysql-test/suite/innodb/r/innodb_bug60229.result
+++ b/mysql-test/suite/innodb/r/innodb_bug60229.result
@@ -4,6 +4,8 @@ DOB VARCHAR(50) NOT NULL,
 NAME NVARCHAR(255) NOT NULL,
 CONSTRAINT PK_PERSON PRIMARY KEY (PERSON_ID, DOB)
 )Engine=InnoDB;
+Warnings:
+Warning	1280	Name 'PK_PERSON' ignored for PRIMARY key.
 CREATE TABLE PHOTO (
 PERSON_ID VARCHAR(50) NOT NULL,
 DOB VARCHAR(50) NOT NULL,
@@ -11,6 +13,8 @@ PHOTO_DETAILS VARCHAR(50) NULL,
 CONSTRAINT PK_PHOTO PRIMARY KEY (PERSON_ID, DOB),
 CONSTRAINT FK_PHOTO_2_PERSON FOREIGN KEY (PERSON_ID, DOB) REFERENCES PERSON (PERSON_ID, DOB)
 )Engine=InnoDB;
+Warnings:
+Warning	1280	Name 'PK_PHOTO' ignored for PRIMARY key.
 CREATE TABLE ADDRESS (
 PERSON_ID VARCHAR(50) NOT NULL,
 DOB VARCHAR(50) NOT NULL,
@@ -19,6 +23,8 @@ ADDRESS_DETAILS NVARCHAR(250) NULL,
 CONSTRAINT PK_ADDRESS PRIMARY KEY (PERSON_ID, DOB, ADDRESS_ID),
 CONSTRAINT FK_ADDRESS_2_PERSON FOREIGN KEY (PERSON_ID, DOB) REFERENCES PERSON (PERSON_ID, DOB) ON DELETE CASCADE
 )Engine=InnoDB;
+Warnings:
+Warning	1280	Name 'PK_ADDRESS' ignored for PRIMARY key.
 INSERT INTO PERSON VALUES("10", "11011999", "John");
 INSERT INTO PHOTO VALUES("10", "11011999", "new photo");
 DROP TABLE PHOTO;
diff --git a/mysql-test/suite/innodb_gis/r/1.result b/mysql-test/suite/innodb_gis/r/1.result
index 8de9fd30894..f4ac87ec56e 100644
--- a/mysql-test/suite/innodb_gis/r/1.result
+++ b/mysql-test/suite/innodb_gis/r/1.result
@@ -796,11 +796,15 @@ POINT(1 1)
 drop function fn3;
 create table t1(pt POINT);
 alter table t1 add primary key pti(pt);
+Warnings:
+Warning	1280	Name 'pti' ignored for PRIMARY key.
 drop table t1;
 create table t1(pt GEOMETRY);
 alter table t1 add primary key pti(pt);
 ERROR 42000: BLOB/TEXT column 'pt' used in key specification without a key length
 alter table t1 add primary key pti(pt(20));
+Warnings:
+Warning	1280	Name 'pti' ignored for PRIMARY key.
 drop table t1;
 create table t1 select ST_GeomFromText('point(1 1)');
 desc t1;
diff --git a/mysql-test/suite/innodb_gis/r/gis.result b/mysql-test/suite/innodb_gis/r/gis.result
index 6929afd4228..f4a973ecdc5 100644
--- a/mysql-test/suite/innodb_gis/r/gis.result
+++ b/mysql-test/suite/innodb_gis/r/gis.result
@@ -792,11 +792,15 @@ POINT(1 1)
 drop function fn3;
 create table t1(pt POINT);
 alter table t1 add primary key pti(pt);
+Warnings:
+Warning	1280	Name 'pti' ignored for PRIMARY key.
 drop table t1;
 create table t1(pt GEOMETRY);
 alter table t1 add primary key pti(pt);
 ERROR 42000: BLOB/TEXT column 'pt' used in key specification without a key length
 alter table t1 add primary key pti(pt(20));
+Warnings:
+Warning	1280	Name 'pti' ignored for PRIMARY key.
 drop table t1;
 create table t1 select ST_GeomFromText('point(1 1)');
 desc t1;
diff --git a/mysql-test/suite/innodb_zip/r/page_size.result b/mysql-test/suite/innodb_zip/r/page_size.result
index 6355b5e76b6..90018e2c8c2 100644
--- a/mysql-test/suite/innodb_zip/r/page_size.result
+++ b/mysql-test/suite/innodb_zip/r/page_size.result
@@ -515,6 +515,8 @@ pk09,pk10,pk11,pk12,pk13,pk14,pk15,pk16),
 KEY pk(sk01,sk02,sk03,sk04,sk05,sk06,sk07,sk08,
 sk09,sk10,sk11,sk12,sk13,sk14,sk15,sk16))
 ROW_FORMAT=Redundant ENGINE=InnoDB;
+Warnings:
+Warning	1280	Name 'pk' ignored for PRIMARY key.
 SET @r = repeat('a', 48);
 INSERT INTO t1 VALUES(@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,
 @r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r);
@@ -546,6 +548,8 @@ pk09,pk10,pk11,pk12,pk13,pk14,pk15,pk16),
 KEY pk(sk01,sk02,sk03,sk04,sk05,sk06,sk07,sk08,
 sk09,sk10,sk11,sk12,sk13,sk14,sk15,sk16))
 ROW_FORMAT=Compressed KEY_BLOCK_SIZE=4 ENGINE=InnoDB;
+Warnings:
+Warning	1280	Name 'pk' ignored for PRIMARY key.
 SET @r = repeat('a', 48);
 INSERT INTO t1 VALUES(@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,
 @r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r);
diff --git a/mysql-test/suite/innodb_zip/r/prefix_index_liftedlimit.result b/mysql-test/suite/innodb_zip/r/prefix_index_liftedlimit.result
index 96e51e506f2..f2bbd86e9c8 100644
--- a/mysql-test/suite/innodb_zip/r/prefix_index_liftedlimit.result
+++ b/mysql-test/suite/innodb_zip/r/prefix_index_liftedlimit.result
@@ -1070,6 +1070,8 @@ CREATE TABLE worklog5743 (
 col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
 PRIMARY KEY `prefix_primary` (col_1_varchar(3072))
 ) ROW_FORMAT=DYNAMIC, engine = innodb;
+Warnings:
+Warning	1280	Name 'prefix_primary' ignored for PRIMARY key.
 INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
 CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
 INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
@@ -1101,6 +1103,8 @@ CREATE TABLE worklog5743 (
 col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
 PRIMARY KEY `prefix_primary` (col_1_varchar(3072))
 ) ROW_FORMAT=DYNAMIC, engine = innodb;
+Warnings:
+Warning	1280	Name 'prefix_primary' ignored for PRIMARY key.
 INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
 CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
 INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
diff --git a/mysql-test/suite/multi_source/disabled.def b/mysql-test/suite/multi_source/disabled.def
index 45c8a6c8891..e69de29bb2d 100644
--- a/mysql-test/suite/multi_source/disabled.def
+++ b/mysql-test/suite/multi_source/disabled.def
@@ -1 +0,0 @@
-mdev-8874 : MDEV-20101 Assertion failure
diff --git a/mysql-test/suite/multi_source/multisource.result b/mysql-test/suite/multi_source/multisource.result
index d99a377f0c5..928c9799854 100644
--- a/mysql-test/suite/multi_source/multisource.result
+++ b/mysql-test/suite/multi_source/multisource.result
@@ -47,6 +47,8 @@ drop database if exists db1;
 create database db1;
 use db1;
 create table t1 (i int auto_increment, f1 varchar(16), primary key pk (i,f1)) engine=MyISAM;
+Warnings:
+Warning	1280	Name 'pk' ignored for PRIMARY key.
 insert into t1 (f1) values ('one'),('two');
 connection slave;
 select * from db1.t1;
diff --git a/mysql-test/suite/parts/r/alter_data_directory_innodb.result b/mysql-test/suite/parts/r/alter_data_directory_innodb.result
index d0ad8cd074c..8a43588ea52 100644
--- a/mysql-test/suite/parts/r/alter_data_directory_innodb.result
+++ b/mysql-test/suite/parts/r/alter_data_directory_innodb.result
@@ -18,6 +18,8 @@ t	CREATE TABLE `t` (
 (PARTITION `p1` DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp/partitions_here' ENGINE = InnoDB,
  PARTITION `p2` DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp/partitions_here' ENGINE = InnoDB)
 ALTER TABLE t ADD PRIMARY KEY pk(a), ALGORITHM=INPLACE;
+Warnings:
+Warning	1280	Name 'pk' ignored for PRIMARY key.
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
@@ -39,6 +41,8 @@ t	CREATE TABLE `t` (
 SET @TMP = @@GLOBAL.INNODB_FILE_PER_TABLE;
 SET GLOBAL INNODB_FILE_PER_TABLE=OFF;
 ALTER TABLE t ADD PRIMARY KEY pk(a), ALGORITHM=INPLACE;
+Warnings:
+Warning	1280	Name 'pk' ignored for PRIMARY key.
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
diff --git a/mysql-test/suite/rpl/r/rpl_blackhole.result b/mysql-test/suite/rpl/r/rpl_blackhole.result
index 178c23b9f98..a87ba9a9d2d 100644
--- a/mysql-test/suite/rpl/r/rpl_blackhole.result
+++ b/mysql-test/suite/rpl/r/rpl_blackhole.result
@@ -42,6 +42,8 @@ COUNT(*)
 >>> Something was written to binary log <<<
 connection master;
 ALTER TABLE t1 ADD PRIMARY KEY pk_t1 (a,b);
+Warnings:
+Warning	1280	Name 'pk_t1' ignored for PRIMARY key.
 connection slave;
 connection master;
 INSERT INTO t1 VALUES (1,2,1),(2,2,2),(3,2,3),(4,2,4);
diff --git a/mysql-test/suite/rpl/r/rpl_blackhole_row_annotate.result b/mysql-test/suite/rpl/r/rpl_blackhole_row_annotate.result
index d92c3dce55b..3c5711855d8 100644
--- a/mysql-test/suite/rpl/r/rpl_blackhole_row_annotate.result
+++ b/mysql-test/suite/rpl/r/rpl_blackhole_row_annotate.result
@@ -47,6 +47,8 @@ COUNT(*)
 >>> Something was written to binary log <<<
 connection master;
 ALTER TABLE t1 ADD PRIMARY KEY pk_t1 (a,b);
+Warnings:
+Warning	1280	Name 'pk_t1' ignored for PRIMARY key.
 connection slave;
 connection master;
 INSERT INTO t1 VALUES (1,2,1),(2,2,2),(3,2,3),(4,2,4);
diff --git a/mysql-test/suite/sys_vars/r/replicate_ignore_table_basic.result b/mysql-test/suite/sys_vars/r/replicate_ignore_table_basic.result
index db97ce14c93..a1701635f0e 100644
--- a/mysql-test/suite/sys_vars/r/replicate_ignore_table_basic.result
+++ b/mysql-test/suite/sys_vars/r/replicate_ignore_table_basic.result
@@ -46,3 +46,13 @@ SELECT @@GLOBAL.replicate_ignore_table;
 
 # Cleanup.
 SET @@GLOBAL.replicate_ignore_table = @save_replicate_ignore_table;
+#
+# MDEV-20101 Assertion failure on select @@global.'m2'.replicate_ignore_table
+#
+SET NAMES latin1;
+SELECT @@global.'m2'.replicate_ignore_table;
+@@global.'m2'.replicate_ignore_table
+NULL
+Warnings:
+Warning	1617	There is no master connection 'm2'
+Warning	1617	There is no master connection 'm2'
diff --git a/mysql-test/suite/sys_vars/t/replicate_ignore_table_basic.test b/mysql-test/suite/sys_vars/t/replicate_ignore_table_basic.test
index 56cf7f17c7f..1cf6f010eca 100644
--- a/mysql-test/suite/sys_vars/t/replicate_ignore_table_basic.test
+++ b/mysql-test/suite/sys_vars/t/replicate_ignore_table_basic.test
@@ -49,3 +49,10 @@ SELECT @@GLOBAL.replicate_ignore_table;
 
 --echo # Cleanup.
 SET @@GLOBAL.replicate_ignore_table = @save_replicate_ignore_table;
+
+--echo #
+--echo # MDEV-20101 Assertion failure on select @@global.'m2'.replicate_ignore_table
+--echo #
+
+SET NAMES latin1;
+SELECT @@global.'m2'.replicate_ignore_table;
diff --git a/mysql-test/suite/versioning/r/online.result b/mysql-test/suite/versioning/r/online.result
index 41a2556628a..36251ddd550 100644
--- a/mysql-test/suite/versioning/r/online.result
+++ b/mysql-test/suite/versioning/r/online.result
@@ -66,7 +66,9 @@ alter table t2
 change a a int with system versioning,
 add primary key pk (a);
 affected rows: 0
-info: Records: 0  Duplicates: 0  Warnings: 0
+info: Records: 0  Duplicates: 0  Warnings: 1
+Warnings:
+Warning	1280	Name 'pk' ignored for PRIMARY key.
 # restart
 update t1 set a=2;
 select count(*) from t1 for system_time all;
diff --git a/mysql-test/suite/versioning/r/trx_id.result b/mysql-test/suite/versioning/r/trx_id.result
index 333b8b3efa0..5d4669c46e2 100644
--- a/mysql-test/suite/versioning/r/trx_id.result
+++ b/mysql-test/suite/versioning/r/trx_id.result
@@ -437,7 +437,9 @@ ALTER TABLE t
 CHANGE a a INT WITH SYSTEM VERSIONING,
 ADD PRIMARY KEY pk(a);
 affected rows: 0
-info: Records: 0  Duplicates: 0  Warnings: 0
+info: Records: 0  Duplicates: 0  Warnings: 1
+Warnings:
+Warning	1280	Name 'pk' ignored for PRIMARY key.
 SELECT c.prtype FROM INFORMATION_SCHEMA.INNODB_SYS_COLUMNS AS c
 INNER JOIN INFORMATION_SCHEMA.INNODB_SYS_TABLES AS t
 ON c.table_id=t.table_id