From c6efbc543d6fb3004f320ef9d02542a4692ca88a Mon Sep 17 00:00:00 2001
From: Alexey Botchkov <holyfoot@askmonty.org>
Date: Tue, 30 Jul 2019 21:57:48 +0400
Subject: MDEV-17544 No warning when trying to name a primary key constraint.

Warning added.
---
 mysql-test/suite/innodb_zip/r/page_size.result                | 4 ++++
 mysql-test/suite/innodb_zip/r/prefix_index_liftedlimit.result | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'mysql-test/suite/innodb_zip')

diff --git a/mysql-test/suite/innodb_zip/r/page_size.result b/mysql-test/suite/innodb_zip/r/page_size.result
index 85ff027781e..3cf6e7a7a58 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));
-- 
cgit v1.2.1