diff options
3 files changed, 10 insertions, 8 deletions
diff --git a/mysql-test/suite/storage_engine/type_char_indexes.result b/mysql-test/suite/storage_engine/type_char_indexes.result index 33594e2581f..5be07bdf53f 100644 --- a/mysql-test/suite/storage_engine/type_char_indexes.result +++ b/mysql-test/suite/storage_engine/type_char_indexes.result @@ -96,6 +96,8 @@ varchar1b 2 varchar2b 1 varchar3b 1 SET SESSION optimizer_switch = 'engine_condition_pushdown=on'; +Warnings: +Warning 1681 'engine_condition_pushdown=on' is deprecated and will be removed in a future release. EXPLAIN SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a'; id select_type table type possible_keys key key_len ref rows Extra # # # range c_v c_v # # # Using index condition diff --git a/storage/innobase/mysql-test/storage_engine/type_char_indexes.rdiff b/storage/innobase/mysql-test/storage_engine/type_char_indexes.rdiff index 7a388552c57..98e17f3c825 100644 --- a/storage/innobase/mysql-test/storage_engine/type_char_indexes.rdiff +++ b/storage/innobase/mysql-test/storage_engine/type_char_indexes.rdiff @@ -1,6 +1,6 @@ ---- suite/storage_engine/type_char_indexes.result 2012-07-12 19:27:42.191013570 +0400 -+++ suite/storage_engine/type_char_indexes.reject 2012-07-15 17:51:55.810034331 +0400 -@@ -135,7 +135,7 @@ +--- suite/storage_engine/type_char_indexes.result 2014-10-12 14:22:11.000000000 +0400 ++++ suite/storage_engine/type_char_indexes.reject 2014-10-12 14:23:28.000000000 +0400 +@@ -137,7 +137,7 @@ r3a EXPLAIN SELECT c,c20,v16,v128 FROM t1 WHERE v16 = 'varchar1a' OR v16 = 'varchar3a' ORDER BY v16; id select_type table type possible_keys key key_len ref rows Extra diff --git a/storage/myisammrg/mysql-test/storage_engine/type_char_indexes.rdiff b/storage/myisammrg/mysql-test/storage_engine/type_char_indexes.rdiff index c80d4acced5..797907fa71a 100644 --- a/storage/myisammrg/mysql-test/storage_engine/type_char_indexes.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/type_char_indexes.rdiff @@ -1,7 +1,7 @@ ---- type_char_indexes.result 2013-01-22 22:05:05.246633000 +0400 -+++ type_char_indexes.reject 2013-01-23 02:51:10.055371738 +0400 -@@ -98,7 +98,7 @@ - SET SESSION optimizer_switch = 'engine_condition_pushdown=on'; +--- suite/storage_engine/type_char_indexes.result 2014-10-12 14:22:11.000000000 +0400 ++++ suite/storage_engine/type_char_indexes.reject 2014-10-12 14:22:41.000000000 +0400 +@@ -100,7 +100,7 @@ + Warning 1681 'engine_condition_pushdown=on' is deprecated and will be removed in a future release. EXPLAIN SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a'; id select_type table type possible_keys key key_len ref rows Extra -# # # range c_v c_v # # # Using index condition @@ -9,7 +9,7 @@ SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a'; c c20 v16 v128 b char3 varchar1a varchar1b -@@ -135,7 +135,7 @@ +@@ -137,7 +137,7 @@ r3a EXPLAIN SELECT c,c20,v16,v128 FROM t1 WHERE v16 = 'varchar1a' OR v16 = 'varchar3a' ORDER BY v16; id select_type table type possible_keys key key_len ref rows Extra |