Skip to content

Commit 9fe1e83

Browse files
igorbabaevigorbabaev
committed
MDEV-16188 Post merge fixes: more for TokuDB
1 parent 651347b commit 9fe1e83

File tree

19 files changed

+58
-42
lines changed

19 files changed

+58
-42
lines changed

‎mysql-test/suite/heap/heap_btree.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ a
4848
alter table t1 add unique uniq_id using BTREE (a);
4949
select * from t1 where a > 736494;
5050
a
51-
869751
5251
802616
52+
869751
5353
select * from t1 where a = 736494;
5454
a
5555
736494

‎mysql-test/suite/heap/heap_btree.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ create table t1 (a int not null) engine=heap;
3737
insert into t1 values (869751),(736494),(226312),(802616),(728912);
3838
select * from t1 where a > 736494;
3939
alter table t1 add unique uniq_id using BTREE (a);
40+
--sorted_result
4041
select * from t1 where a > 736494;
4142
select * from t1 where a = 736494;
4243
select * from t1 where a=869751 or a=736494;

‎mysql-test/suite/heap/heap_hash.result

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -426,13 +426,14 @@ select 0+a from t1 where a=869751 or a=736494;
426426
explain select 0+a from t1 where a=869751 or a=736494;
427427
id select_type table type possible_keys key key_len ref rows Extra
428428
1 SIMPLE t1 range uniq_id uniq_id 8 NULL 2 Using where
429-
select 0+a from t1 where a in (869751,736494,226312,802616);
429+
select 0+a from t1 where a in (869751,736494,226312,802616,728912);
430430
0+a
431431
869751
432432
736494
433433
226312
434434
802616
435-
explain select 0+a from t1 where a in (869751,736494,226312,802616);
435+
728912
436+
explain select 0+a from t1 where a in (869751,736494,226312,802616,728912);
436437
id select_type table type possible_keys key key_len ref rows Extra
437438
1 SIMPLE t1 ALL uniq_id NULL NULL NULL 5 Using where
438439
drop table t1;

‎mysql-test/suite/heap/heap_hash.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,8 @@ select 0+a from t1 where a = 736494;
313313
explain select 0+a from t1 where a = 736494;
314314
select 0+a from t1 where a=869751 or a=736494;
315315
explain select 0+a from t1 where a=869751 or a=736494;
316-
select 0+a from t1 where a in (869751,736494,226312,802616);
317-
explain select 0+a from t1 where a in (869751,736494,226312,802616);
316+
select 0+a from t1 where a in (869751,736494,226312,802616,728912);
317+
explain select 0+a from t1 where a in (869751,736494,226312,802616,728912);
318318
drop table t1;
319319

320320
--echo End of 5.3 tests

‎mysql-test/suite/innodb/r/mdev-117.result

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ DELETE IGNORE FROM t1;;
1212
connection con1;
1313
DELETE FROM t1 WHERE col_int_key IN (1, 40000000);
1414
connection default;
15-
Warnings:
16-
Warning 1205 Lock wait timeout exceeded; try restarting transaction
1715
disconnect con1;
1816
drop table t1;
1917
SET GLOBAL innodb_lock_wait_timeout=default;

‎mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,15 @@
507507
VARIABLE_COMMENT Maximum stored procedure recursion depth
508508
NUMERIC_MIN_VALUE 0
509509
NUMERIC_MAX_VALUE 255
510+
@@ -2485,7 +2485,7 @@
511+
VARIABLE_TYPE BIGINT UNSIGNED
512+
VARIABLE_COMMENT The maximum size of the container of a rowid filter
513+
NUMERIC_MIN_VALUE 1024
514+
-NUMERIC_MAX_VALUE 18446744073709551615
515+
+NUMERIC_MAX_VALUE 4294967295
516+
NUMERIC_BLOCK_SIZE 1
517+
ENUM_VALUE_LIST NULL
518+
READ_ONLY NO
510519
@@ -2494,7 +2494,7 @@
511520
GLOBAL_VALUE_ORIGIN COMPILE-TIME
512521
DEFAULT_VALUE 32

‎sql/sql_explain.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1357,7 +1357,8 @@ int Explain_table_access::print_explain(select_result_sink *output, uint8 explai
13571357
if (rowid_filter)
13581358
{
13591359
r_rows_str.append(" (");
1360-
r_rows_str.append_ulonglong(rowid_filter->tracker->get_r_selectivity_pct() * 100.0);
1360+
r_rows_str.append_ulonglong(
1361+
(ulonglong) (rowid_filter->tracker->get_r_selectivity_pct() * 100.0));
13611362
r_rows_str.append("%)");
13621363
}
13631364
item_list.push_back(new (mem_root)

‎storage/sequence/mysql-test/sequence/simple.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ Tables_in_test
124124
explain select * from seq_1_to_15_step_2;
125125
id select_type table type possible_keys key key_len ref rows Extra
126126
1 SIMPLE seq_1_to_15_step_2 index NULL PRIMARY 8 NULL 8 Using index
127-
explain select * from seq_1_to_15_step_2 where seq > 4;
127+
explain select * from seq_1_to_15_step_2 where seq > 10;
128128
id select_type table type possible_keys key key_len ref rows Extra
129-
1 SIMPLE seq_1_to_15_step_2 range PRIMARY PRIMARY 8 NULL 6 Using where; Using index
129+
1 SIMPLE seq_1_to_15_step_2 range PRIMARY PRIMARY 8 NULL 3 Using where; Using index
130130
explain select * from seq_1_to_15_step_2 where seq between 4 and 9;
131131
id select_type table type possible_keys key key_len ref rows Extra
132132
1 SIMPLE seq_1_to_15_step_2 range PRIMARY PRIMARY 8 NULL 3 Using where; Using index

‎storage/sequence/mysql-test/sequence/simple.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ show open tables from test;
5252
show tables;
5353
# row estimates
5454
explain select * from seq_1_to_15_step_2;
55-
explain select * from seq_1_to_15_step_2 where seq > 4;
55+
explain select * from seq_1_to_15_step_2 where seq > 10;
5656
explain select * from seq_1_to_15_step_2 where seq between 4 and 9;
5757
explain select * from seq_1_to_15_step_2 where seq between 20 and 30;
5858
explain select * from seq_1_to_15_step_2 where seq between 4 and 6;

‎storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_with_lock_sps.result

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ z a b c
2020
999 4 40 400
2121
explain select * from foo where b > 20;
2222
id select_type table type possible_keys key key_len ref rows Extra
23-
1 SIMPLE foo range b b 5 NULL 2 Using where; Using index
23+
1 SIMPLE foo index b b 5 NULL 4 Using where; Using index
2424
select* from foo where b > 10;
2525
z a b c
2626
999 2 20 200
@@ -40,7 +40,7 @@ a b c
4040
4 40 400
4141
explain select * from foo where b > 20;
4242
id select_type table type possible_keys key key_len ref rows Extra
43-
1 SIMPLE foo range b b 5 NULL 2 Using where; Using index
43+
1 SIMPLE foo index b b 5 NULL 4 Using where; Using index
4444
select* from foo where b > 10;
4545
a b c
4646
2 20 200
@@ -59,7 +59,7 @@ a b c z
5959
4 40 400 NULL
6060
explain select * from foo where b > 20;
6161
id select_type table type possible_keys key key_len ref rows Extra
62-
1 SIMPLE foo range b b 5 NULL 2 Using where; Using index
62+
1 SIMPLE foo index b b 5 NULL 4 Using where; Using index
6363
select* from foo where b > 10;
6464
a b c z
6565
2 20 200 NULL
@@ -94,7 +94,7 @@ a b c
9494
3 30 300
9595
4 40 400
9696
id select_type table type possible_keys key key_len ref rows Extra
97-
1 SIMPLE foo range b b 5 NULL 2 Using where; Using index
97+
1 SIMPLE foo index b b 5 NULL 4 Using where; Using index
9898
a b c
9999
2 20 200
100100
3 30 300
@@ -110,7 +110,7 @@ a b c
110110
4 40 400
111111
explain select * from foo where b > 20;
112112
id select_type table type possible_keys key key_len ref rows Extra
113-
1 SIMPLE foo range b b 5 NULL 2 Using where; Using index
113+
1 SIMPLE foo index b b 5 NULL 4 Using where; Using index
114114
select* from foo where b > 10;
115115
a b c
116116
2 20 200
@@ -154,7 +154,7 @@ a b c g
154154
4 40 400 NULL
155155
5 50 500 NULL
156156
id select_type table type possible_keys key key_len ref rows Extra
157-
1 SIMPLE foo range b b 5 NULL 3 Using where; Using index
157+
1 SIMPLE foo index b b 5 NULL 5 Using where; Using index
158158
set autocommit=on;
159159
explain select * from foo;
160160
id select_type table type possible_keys key key_len ref rows Extra

0 commit comments

Comments
 (0)