Commit 8e27845b authored by Alexander Barkov's avatar Alexander Barkov

A follow up fix for MDEV-5528

(forgot to do "git add" for two files in the previous commit for MDEV-5528)
parent 251fa7ff
...@@ -694,7 +694,7 @@ EXPLAIN ...@@ -694,7 +694,7 @@ EXPLAIN
SELECT COUNT(*) FROM t1 FORCE INDEX(idx_b, idx_c) SELECT COUNT(*) FROM t1 FORCE INDEX(idx_b, idx_c)
WHERE (c >= '2007-01-02' AND c <= '2007-01-03') OR b >= 1; WHERE (c >= '2007-01-02' AND c <= '2007-01-03') OR b >= 1;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index_merge idx_b,idx_c idx_c,idx_b 8,4 NULL # Using sort_union(idx_c,idx_b); Using where 1 SIMPLE t1 index_merge idx_b,idx_c idx_c,idx_b 5,4 NULL # Using sort_union(idx_c,idx_b); Using where
SELECT COUNT(*) FROM t1 FORCE INDEX(idx_b, idx_c) SELECT COUNT(*) FROM t1 FORCE INDEX(idx_b, idx_c)
WHERE (c >= '2007-01-02' AND c <= '2007-01-03') OR b >= 1; WHERE (c >= '2007-01-02' AND c <= '2007-01-03') OR b >= 1;
COUNT(*) COUNT(*)
......
...@@ -194,7 +194,7 @@ dict_stats_persistent_storage_check( ...@@ -194,7 +194,7 @@ dict_stats_persistent_storage_check(
{"table_name", DATA_VARMYSQL, {"table_name", DATA_VARMYSQL,
DATA_NOT_NULL, 192}, DATA_NOT_NULL, 192},
{"last_update", DATA_INT, {"last_update", DATA_FIXBINARY,
DATA_NOT_NULL, 4}, DATA_NOT_NULL, 4},
{"n_rows", DATA_INT, {"n_rows", DATA_INT,
...@@ -225,7 +225,7 @@ dict_stats_persistent_storage_check( ...@@ -225,7 +225,7 @@ dict_stats_persistent_storage_check(
{"index_name", DATA_VARMYSQL, {"index_name", DATA_VARMYSQL,
DATA_NOT_NULL, 192}, DATA_NOT_NULL, 192},
{"last_update", DATA_INT, {"last_update", DATA_FIXBINARY,
DATA_NOT_NULL, 4}, DATA_NOT_NULL, 4},
{"stat_name", DATA_VARMYSQL, {"stat_name", DATA_VARMYSQL,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment