summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2021-03-21 14:18:46 +0300
committerSergei Petrunia <psergey@askmonty.org>2021-03-21 14:20:46 +0300
commit81b5e7dd68e0201a00be2c9eee714b37d456dcc4 (patch)
treecde05d500974849b36c5765e04fb7dde29c4b641 /storage
parentc22e6eeda81b9c3b8c79d4ef527b2a002d6d691b (diff)
downloadmariadb-git-81b5e7dd68e0201a00be2c9eee714b37d456dcc4.tar.gz
MDEV-7317: Make an index ignorable to the optimizer
Update test results: rocksdb.type_blob_indexes, rocksdb.type_text_indexes
Diffstat (limited to 'storage')
-rw-r--r--storage/rocksdb/mysql-test/rocksdb/r/type_blob_indexes.result18
-rw-r--r--storage/rocksdb/mysql-test/rocksdb/r/type_text_indexes.result10
2 files changed, 14 insertions, 14 deletions
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 1e614a2bbf1..40e31e9fe6d 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/type_blob_indexes.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/type_blob_indexes.result
@@ -11,8 +11,8 @@ PRIMARY KEY b (b(32))
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
+Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored
+t1 0 PRIMARY 1 b A 1000 32 NULL LSMTREE NO
INSERT INTO t1 (b,t,m,l) VALUES
('','','',''),
('a','b','c','d'),
@@ -49,10 +49,10 @@ pk INT AUTO_INCREMENT PRIMARY KEY,
UNIQUE INDEX l_t (l(256),t(64))
) ENGINE=rocksdb;
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 # # NULL NULL # #
-t1 0 l_t 1 l # # 256 NULL # #
-t1 0 l_t 2 t # # 64 NULL # #
+Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored
+t1 0 PRIMARY 1 pk # # NULL NULL # # NO
+t1 0 l_t 1 l # # 256 NULL # # NO
+t1 0 l_t 2 t # # 64 NULL # # NO
INSERT INTO t1 (b,t,m,l) VALUES
('','','',''),
('a','b','c','d'),
@@ -105,9 +105,9 @@ pk INT AUTO_INCREMENT PRIMARY KEY,
INDEX (m(128))
) ENGINE=rocksdb;
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 NULL NULL LSMTREE
-t1 1 m 1 m A 500 128 NULL YES LSMTREE
+Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored
+t1 0 PRIMARY 1 pk A 1000 NULL NULL LSMTREE NO
+t1 1 m 1 m A 500 128 NULL YES LSMTREE NO
INSERT INTO t1 (b,t,m,l) VALUES
('','','',''),
('a','b','c','d'),
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 7db5c23c53f..ddab60cc5c3 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/type_text_indexes.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/type_text_indexes.result
@@ -11,8 +11,8 @@ PRIMARY KEY t (t(32))
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
+Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored
+t1 0 PRIMARY 1 t A 1000 32 NULL LSMTREE NO
INSERT INTO t1 (t,tt,m,l) VALUES
('','','',''),
('a','b','c','d'),
@@ -60,9 +60,9 @@ INDEX (m(128))
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
-t1 1 m 1 m A 500 128 NULL YES LSMTREE
+Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored
+t1 0 PRIMARY 1 pk A 1000 1 NULL LSMTREE NO
+t1 1 m 1 m A 500 128 NULL YES LSMTREE NO
INSERT INTO t1 (t,tt,m,l,pk) VALUES
('','','','','0'),
('a','b','c','d','1'),