diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-08-13 11:42:31 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-08-13 11:42:31 +0400 |
| commit | 95cdc1ca5f006965e1b0e53a8567f6dbb87e01a1 (patch) | |
| tree | 20f91c9dfc995df26363073737c34e8fe565bfe6 /mysql-test/suite/innodb_zip | |
| parent | ae1d17f52de045b37e0894e1e6684a911a43696c (diff) | |
| parent | 43882e764d6867c6855b1ff057758a3f08b25c55 (diff) | |
| download | mariadb-git-95cdc1ca5f006965e1b0e53a8567f6dbb87e01a1.tar.gz | |
Merge commit '43882e764d6867c6855b1ff057758a3f08b25c55' into 10.4
Diffstat (limited to 'mysql-test/suite/innodb_zip')
| -rw-r--r-- | mysql-test/suite/innodb_zip/r/page_size.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/innodb_zip/r/prefix_index_liftedlimit.result | 4 |
2 files changed, 8 insertions, 0 deletions
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)); |