revision-id: f36c0189b15b7ba0bd2de187223fe59f2359186e (mariadb-10.3.17-6-gf36c0189b15) parent(s): 4c4e379ba983553ea4df07eb1fe90745d173a866 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-08-06 14:37:08 +0300 message: MDEV-17544: No warning when trying to name a primary key constraint Part#2: update .result files for affected MyRocks tests --- .../mysql-test/rocksdb/r/add_unique_index_inplace.result | 8 ++++++++ .../mysql-test/rocksdb/r/type_blob_indexes.result | 10 ++++++++++ .../mysql-test/rocksdb/r/type_text_indexes.result | 16 ++++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/storage/rocksdb/mysql-test/rocksdb/r/add_unique_index_inplace.result b/storage/rocksdb/mysql-test/rocksdb/r/add_unique_index_inplace.result index f7c4bab685d..e998cfb43c1 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/add_unique_index_inplace.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/add_unique_index_inplace.result @@ -1,5 +1,7 @@ drop table if exists t1; CREATE TABLE t1 (a INT, b INT, PRIMARY KEY ka(a)) ENGINE=RocksDB; +Warnings: +Warning 1280 Name 'ka' ignored for PRIMARY key. INSERT INTO t1 (a, b) VALUES (1, 5); INSERT INTO t1 (a, b) VALUES (2, 6); INSERT INTO t1 (a, b) VALUES (3, 7); @@ -15,6 +17,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 DROP TABLE t1; CREATE TABLE t1 (a INT, b INT, PRIMARY KEY ka(a)) ENGINE=RocksDB; +Warnings: +Warning 1280 Name 'ka' ignored for PRIMARY key. INSERT INTO t1 (a, b) VALUES (1, 5); INSERT INTO t1 (a, b) VALUES (2, 6); INSERT INTO t1 (a, b) VALUES (3, 7); @@ -38,6 +42,8 @@ a b 5 8 DROP TABLE t1; CREATE TABLE t1 (a INT, b INT, PRIMARY KEY ka(a)) ENGINE=RocksDB; +Warnings: +Warning 1280 Name 'ka' ignored for PRIMARY key. INSERT INTO t1 (a, b) VALUES (1, 5); INSERT INTO t1 (a, b) VALUES (2, NULL); INSERT INTO t1 (a, b) VALUES (3, NULL); @@ -56,6 +62,8 @@ COUNT(*) 4 DROP TABLE t1; CREATE TABLE t1 (a INT, b INT, c INT, PRIMARY KEY ka(a)) ENGINE=RocksDB; +Warnings: +Warning 1280 Name 'ka' ignored for PRIMARY key. INSERT INTO t1 (a,b,c) VALUES (1,1,NULL); INSERT INTO t1 (a,b,c) VALUES (2,1,NULL); INSERT INTO t1 (a,b,c) VALUES (3,1,NULL); diff --git a/storage/rocksdb/mysql-test/rocksdb/r/type_blob_indexes.result b/storage/rocksdb/mysql-test/rocksdb/r/type_blob_indexes.result index 26726e0f6d1..1e614a2bbf1 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/type_blob_indexes.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/type_blob_indexes.result @@ -8,6 +8,8 @@ m MEDIUMBLOB, l LONGBLOB, PRIMARY KEY b (b(32)) ) ENGINE=rocksdb; +Warnings: +Warning 1280 Name 'b' ignored for PRIMARY key. SHOW INDEX IN t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment t1 0 PRIMARY 1 b A 1000 32 NULL LSMTREE @@ -133,6 +135,8 @@ CREATE TABLE t1 ( b BLOB, PRIMARY KEY b (b(32)) ) ENGINE=rocksdb; +Warnings: +Warning 1280 Name 'b' ignored for PRIMARY key. INSERT INTO t1 (b) VALUES ('00000000000000000000000000000000'), ('00000000000000000000000000000001'), @@ -147,6 +151,8 @@ CREATE TABLE t1 ( b TINYBLOB, PRIMARY KEY b (b(32)) ) ENGINE=rocksdb; +Warnings: +Warning 1280 Name 'b' ignored for PRIMARY key. INSERT INTO t1 (b) VALUES ('00000000000000000000000000000000'), ('00000000000000000000000000000001'), @@ -161,6 +167,8 @@ CREATE TABLE t1 ( b MEDIUMBLOB, PRIMARY KEY b (b(32)) ) ENGINE=rocksdb; +Warnings: +Warning 1280 Name 'b' ignored for PRIMARY key. INSERT INTO t1 (b) VALUES ('00000000000000000000000000000000'), ('00000000000000000000000000000001'), @@ -175,6 +183,8 @@ CREATE TABLE t1 ( b LONGBLOB, PRIMARY KEY b (b(32)) ) ENGINE=rocksdb; +Warnings: +Warning 1280 Name 'b' ignored for PRIMARY key. INSERT INTO t1 (b) VALUES ('00000000000000000000000000000000'), ('00000000000000000000000000000001'), diff --git a/storage/rocksdb/mysql-test/rocksdb/r/type_text_indexes.result b/storage/rocksdb/mysql-test/rocksdb/r/type_text_indexes.result index 22318316596..7db5c23c53f 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/type_text_indexes.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/type_text_indexes.result @@ -8,6 +8,8 @@ m MEDIUMTEXT, l LONGTEXT, PRIMARY KEY t (t(32)) ) ENGINE=rocksdb; +Warnings: +Warning 1280 Name 't' ignored for PRIMARY key. SHOW INDEX IN t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment t1 0 PRIMARY 1 t A 1000 32 NULL LSMTREE @@ -55,6 +57,8 @@ pk MEDIUMTEXT, PRIMARY KEY mt (pk(1)), INDEX (m(128)) ) ENGINE=rocksdb; +Warnings: +Warning 1280 Name 'mt' ignored for PRIMARY key. SHOW INDEX IN t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment t1 0 PRIMARY 1 pk A 1000 1 NULL LSMTREE @@ -80,6 +84,8 @@ CREATE TABLE t1 ( b TEXT, PRIMARY KEY b (b(32)) ) ENGINE=rocksdb; +Warnings: +Warning 1280 Name 'b' ignored for PRIMARY key. INSERT INTO t1 (b) VALUES ('00000000000000000000000000000000'), ('00000000000000000000000000000001'), @@ -94,6 +100,8 @@ CREATE TABLE t1 ( b TINYTEXT, PRIMARY KEY b (b(32)) ) ENGINE=rocksdb; +Warnings: +Warning 1280 Name 'b' ignored for PRIMARY key. INSERT INTO t1 (b) VALUES ('00000000000000000000000000000000'), ('00000000000000000000000000000001'), @@ -108,6 +116,8 @@ CREATE TABLE t1 ( b MEDIUMTEXT, PRIMARY KEY b (b(32)) ) ENGINE=rocksdb; +Warnings: +Warning 1280 Name 'b' ignored for PRIMARY key. INSERT INTO t1 (b) VALUES ('00000000000000000000000000000000'), ('00000000000000000000000000000001'), @@ -122,6 +132,8 @@ CREATE TABLE t1 ( b LONGTEXT, PRIMARY KEY b (b(32)) ) ENGINE=rocksdb; +Warnings: +Warning 1280 Name 'b' ignored for PRIMARY key. INSERT INTO t1 (b) VALUES ('00000000000000000000000000000000'), ('00000000000000000000000000000001'), @@ -136,6 +148,8 @@ CREATE TABLE t1 ( b LONGTEXT CHARACTER SET "binary" COLLATE "binary", PRIMARY KEY b (b(32)) ) ENGINE=rocksdb; +Warnings: +Warning 1280 Name 'b' ignored for PRIMARY key. INSERT INTO t1 (b) VALUES ('00000000000000000000000000000000'), ('00000000000000000000000000000001'), @@ -154,6 +168,8 @@ CREATE TABLE t1 ( b LONGTEXT CHARACTER SET "latin1" COLLATE "latin1_bin", PRIMARY KEY b (b(32)) ) ENGINE=rocksdb; +Warnings: +Warning 1280 Name 'b' ignored for PRIMARY key. INSERT INTO t1 (b) VALUES (''), (_binary 0x0), (' '); ERROR 23000: Duplicate entry ' ' for key 'PRIMARY' INSERT INTO t1 (b) VALUES (''), (_binary 0x0);