diff options
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/index_merge_innodb.result | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/mysql-test/r/index_merge_innodb.result b/mysql-test/r/index_merge_innodb.result index f5396bc88ff..5bf7aceb597 100644 --- a/mysql-test/r/index_merge_innodb.result +++ b/mysql-test/r/index_merge_innodb.result @@ -815,8 +815,6 @@ SET @save_sort_buffer_size=@@sort_buffer_size; SET @save_innodb_file_format= @@innodb_file_format; SET @save_innodb_large_prefix= @@innodb_large_prefix; SET sort_buffer_size=2048; -SET GLOBAL innodb_file_format = BARRACUDA; -SET GLOBAL innodb_large_prefix = ON; CREATE TABLE t1 ( a VARCHAR(1024) CHARACTER SET UTF8 PRIMARY KEY, b INT, @@ -826,7 +824,7 @@ INDEX (b) INSERT INTO t1 SELECT seq, seq, seq from seq_1_to_100; EXPLAIN SELECT * FROM t1 WHERE a='1' OR b < 5; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 index_merge PRIMARY,b b,PRIMARY 5,3074 NULL 4 Using sort_union(b,PRIMARY); Using where +1 SIMPLE t1 index_merge PRIMARY,b b,PRIMARY 5,3074 NULL 5 Using sort_union(b,PRIMARY); Using where SELECT * FROM t1 WHERE a='1' OR b < 5; a b c 2 2 2 @@ -834,7 +832,5 @@ a b c 4 4 4 1 1 1 DROP TABLE t1; -SET GLOBAL innodb_file_format = @save_innodb_file_format; -SET GLOBAL innodb_large_prefix = @save_innodb_large_prefix; SET sort_buffer_size= @save_sort_buffer_size; disconnect disable_purge; |