summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorElena Stepanova <elenst@montyprogram.com>2016-02-26 00:25:55 +0200
committerElena Stepanova <elenst@montyprogram.com>2016-02-26 00:25:55 +0200
commite7d50efc458b95d5fad92f6020758d7c63b0dc0b (patch)
tree4b120eb2e70098ccb264eac70459140b9ded19a5 /storage
parent5f2f3c4fa81851b45dcee33601f14e05f6407333 (diff)
downloadmariadb-git-e7d50efc458b95d5fad92f6020758d7c63b0dc0b.tar.gz
MDEV-7907 tokudb.cluster_filter_unpack_varchar_hidden fails sporadically in buildbot
Index access becomes range every once in a while. Masked the value in addition to other already masked columns
Diffstat (limited to 'storage')
-rw-r--r--storage/tokudb/mysql-test/tokudb/r/cluster_filter_unpack_varchar_hidden.result4
-rw-r--r--storage/tokudb/mysql-test/tokudb/t/cluster_filter_unpack_varchar_hidden.test4
2 files changed, 4 insertions, 4 deletions
diff --git a/storage/tokudb/mysql-test/tokudb/r/cluster_filter_unpack_varchar_hidden.result b/storage/tokudb/mysql-test/tokudb/r/cluster_filter_unpack_varchar_hidden.result
index 640c7badc71..6269b8f2d71 100644
--- a/storage/tokudb/mysql-test/tokudb/r/cluster_filter_unpack_varchar_hidden.result
+++ b/storage/tokudb/mysql-test/tokudb/r/cluster_filter_unpack_varchar_hidden.result
@@ -182,14 +182,14 @@ a b c d e f
3 30 200 2000 20000 200000
explain select * from t1 where b > "0";
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t1 index b b NULL NULL NULL; Using where; Using index
+1 SIMPLE t1 <type> b b NULL NULL NULL; Using where; Using index
select * from t1 where b > "0";
a b c d e f
2 20 100 1000 10000 100000
3 30 200 2000 20000 200000
explain select * from t1 where d > "0";
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t1 index d d NULL NULL NULL; Using where; Using index
+1 SIMPLE t1 <type> d d NULL NULL NULL; Using where; Using index
select * from t1 where d > "0";
a b c d e f
2 20 100 1000 10000 100000
diff --git a/storage/tokudb/mysql-test/tokudb/t/cluster_filter_unpack_varchar_hidden.test b/storage/tokudb/mysql-test/tokudb/t/cluster_filter_unpack_varchar_hidden.test
index d1be871c7d2..e9bb18a586e 100644
--- a/storage/tokudb/mysql-test/tokudb/t/cluster_filter_unpack_varchar_hidden.test
+++ b/storage/tokudb/mysql-test/tokudb/t/cluster_filter_unpack_varchar_hidden.test
@@ -82,11 +82,11 @@ alter table t1 add key d(d,a) clustering=yes, add key b(b) clustering=yes;
explain select * from t1;
select * from t1;
---replace_column 7 NULL 9 NULL;
+--replace_column 4 <type> 7 NULL 9 NULL;
explain select * from t1 where b > "0";
select * from t1 where b > "0";
---replace_column 7 NULL 9 NULL;
+--replace_column 4 <type> 7 NULL 9 NULL;
explain select * from t1 where d > "0";
select * from t1 where d > "0";