From a2a2e32c02643a0cec111511220227703fda1cd5 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 1 Jul 2024 20:15:00 +0200 Subject: Merging upstream version 1:11.4.2. Signed-off-by: Daniel Baumann --- .../myisammrg/mysql-test/storage_engine/type_char_indexes.rdiff | 9 --------- 1 file changed, 9 deletions(-) (limited to 'storage/myisammrg/mysql-test/storage_engine') 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 797907fa..78c47ded 100644 --- a/storage/myisammrg/mysql-test/storage_engine/type_char_indexes.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/type_char_indexes.rdiff @@ -1,14 +1,5 @@ --- 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 -+# # # ALL c_v NULL # # # Using where - SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a'; - c c20 v16 v128 - b char3 varchar1a varchar1b @@ -137,7 +137,7 @@ r3a EXPLAIN SELECT c,c20,v16,v128 FROM t1 WHERE v16 = 'varchar1a' OR v16 = 'varchar3a' ORDER BY v16; -- cgit v1.2.3