Skip to content

Commit 22d7860

Browse files
vuvovavuvova
committed
fix tokudb tests after the merge
1 parent dde558f commit 22d7860

16 files changed

+50
-48
lines changed

‎storage/tokudb/mysql-test/tokudb/r/card_auto_analyze_lots.result

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -798,3 +798,8 @@ SHOW INDEX FROM ar_1;
798798
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
799799
ar_1 0 PRIMARY 1 a A 1 NULL NULL BTREE
800800
ar_1 1 bkey 1 b A 1 NULL NULL YES BTREE
801+
SET SESSION tokudb_auto_analyze = @orig_auto_analyze;
802+
SET SESSION tokudb_analyze_in_background = @orig_in_background;
803+
SET SESSION tokudb_analyze_mode = @orig_mode;
804+
SET SESSION tokudb_analyze_throttle = @orig_throttle;
805+
SET SESSION tokudb_analyze_time = @orig_time;

‎storage/tokudb/mysql-test/tokudb_bugs/disabled.def

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
5585: times out, too many huge insert...selects
2+
db233: different execution path in mariadb, debug_sync point is not hit

‎storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock.result

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
SET DEFAULT_STORAGE_ENGINE = 'tokudb';
22
set global tokudb_checkpoint_on_flush_logs=ON;
33
# Establish connection conn1 (user = root)
4-
select DB, command, state, info from information_schema.processlist order by info;
4+
select DB, command, state, info from information_schema.processlist where id != connection_id();
55
DB command state info
66
test Sleep NULL
7-
test Query Filling schema table select DB, command, state, info from information_schema.processlist order by info
87
flush logs;
9-
select DB, command, state, info from information_schema.processlist order by info;
8+
select DB, command, state, info from information_schema.processlist where id != connection_id();
109
DB command state info
1110
test Sleep NULL
12-
test Query Filling schema table select DB, command, state, info from information_schema.processlist order by info
1311
set tokudb_checkpoint_lock=1;
1412
flush logs;;
15-
select DB, command, state, info from information_schema.processlist order by info;
13+
select DB, command, state, info from information_schema.processlist where id != connection_id();
1614
DB command state info
1715
test Query init flush logs
18-
test Query Filling schema table select DB, command, state, info from information_schema.processlist order by info
1916
set tokudb_checkpoint_lock=0;
2017
set global tokudb_checkpoint_on_flush_logs=OFF;

‎storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock_3.result

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
SET DEFAULT_STORAGE_ENGINE = 'tokudb';
22
# Establish connection conn1 (user = root)
3-
select DB, command, state, info from information_schema.processlist order by info;
3+
select DB, command, state, info from information_schema.processlist where id != connection_id();
44
DB command state info
55
test Sleep NULL
6-
test Query Filling schema table select DB, command, state, info from information_schema.processlist order by info
76
flush logs;
8-
select DB, command, state, info from information_schema.processlist order by info;
7+
select DB, command, state, info from information_schema.processlist where id != connection_id();
98
DB command state info
109
test Sleep NULL
11-
test Query Filling schema table select DB, command, state, info from information_schema.processlist order by info
1210
set tokudb_checkpoint_lock=1;
1311
flush logs;;
14-
select DB, command, state, info from information_schema.processlist order by info;
12+
select DB, command, state, info from information_schema.processlist where id != connection_id();
1513
DB command state info
1614
test Sleep NULL
17-
test Query Filling schema table select DB, command, state, info from information_schema.processlist order by info
1815
set tokudb_checkpoint_lock=0;

‎storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ drop table if exists t;
33
create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2;
44
show indexes from t;
55
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
6-
t 0 PRIMARY 1 id A 0 NULL NULL BTREE
7-
t 1 x 1 x A 0 NULL NULL YES BTREE
6+
t 0 PRIMARY 1 id A 2 NULL NULL BTREE
7+
t 1 x 1 x A 2 NULL NULL YES BTREE
88
insert into t values (1,1),(3,1),(5,1);
99
insert into t values (2,1),(4,1),(6,1);
1010
show indexes from t;

‎storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_1.result

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ drop table if exists t;
33
create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2;
44
show indexes from t;
55
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
6-
t 0 PRIMARY 1 id A 0 NULL NULL BTREE
7-
t 1 x 1 x A 0 NULL NULL YES BTREE
6+
t 0 PRIMARY 1 id A 2 NULL NULL BTREE
7+
t 1 x 1 x A 2 NULL NULL YES BTREE
88
insert into t values (1,1),(3,1),(5,1);
99
show indexes from t;
1010
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
11-
t 0 PRIMARY 1 id A 3 NULL NULL BTREE
12-
t 1 x 1 x A 3 NULL NULL YES BTREE
11+
t 0 PRIMARY 1 id A 4 NULL NULL BTREE
12+
t 1 x 1 x A 4 NULL NULL YES BTREE
1313
analyze table t;
1414
Table Op Msg_type Msg_text
1515
test.t analyze status OK
1616
show indexes from t;
1717
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
18-
t 0 PRIMARY 1 id A 3 NULL NULL BTREE
19-
t 1 x 1 x A 3 NULL NULL YES BTREE
18+
t 0 PRIMARY 1 id A 4 NULL NULL BTREE
19+
t 1 x 1 x A 4 NULL NULL YES BTREE
2020
drop table t;

‎storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_1_pick.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ drop table if exists t;
33
create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2;
44
show indexes from t;
55
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
6-
t 0 PRIMARY 1 id A 0 NULL NULL BTREE
7-
t 1 x 1 x A 0 NULL NULL YES BTREE
6+
t 0 PRIMARY 1 id A 2 NULL NULL BTREE
7+
t 1 x 1 x A 2 NULL NULL YES BTREE
88
insert into t values (1,1),(3,2),(5,3);
99
insert into t values (2,1),(4,1),(6,1),(8,1);
1010
show indexes from t;

‎storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_2.result

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ drop table if exists t;
33
create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2;
44
show indexes from t;
55
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
6-
t 0 PRIMARY 1 id A 0 NULL NULL BTREE
7-
t 1 x 1 x A 0 NULL NULL YES BTREE
6+
t 0 PRIMARY 1 id A 2 NULL NULL BTREE
7+
t 1 x 1 x A 2 NULL NULL YES BTREE
88
insert into t values (2,1),(4,1),(6,1);
99
show indexes from t;
1010
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
11-
t 0 PRIMARY 1 id A 3 NULL NULL BTREE
12-
t 1 x 1 x A 3 NULL NULL YES BTREE
11+
t 0 PRIMARY 1 id A 4 NULL NULL BTREE
12+
t 1 x 1 x A 4 NULL NULL YES BTREE
1313
analyze table t;
1414
Table Op Msg_type Msg_text
1515
test.t analyze status OK
1616
show indexes from t;
1717
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
18-
t 0 PRIMARY 1 id A 3 NULL NULL BTREE
19-
t 1 x 1 x A 3 NULL NULL YES BTREE
18+
t 0 PRIMARY 1 id A 4 NULL NULL BTREE
19+
t 1 x 1 x A 4 NULL NULL YES BTREE
2020
drop table t;

‎storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_2_pick.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ drop table if exists t;
33
create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2;
44
show indexes from t;
55
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
6-
t 0 PRIMARY 1 id A 0 NULL NULL BTREE
7-
t 1 x 1 x A 0 NULL NULL YES BTREE
6+
t 0 PRIMARY 1 id A 2 NULL NULL BTREE
7+
t 1 x 1 x A 2 NULL NULL YES BTREE
88
insert into t values (1,1),(3,2),(5,3),(7,4);
99
insert into t values (2,1),(4,1),(6,1);
1010
show indexes from t;

‎storage/tokudb/mysql-test/tokudb_bugs/r/db757_part_alter_analyze.result

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,25 @@ partition by range(id)
66
insert into t values (1,1,1),(2,1,2),(3,1,3),(4,1,4);
77
show indexes from t;
88
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
9-
t 0 PRIMARY 1 id A 4 NULL NULL BTREE
10-
t 1 x 1 x A 4 NULL NULL YES BTREE
11-
t 1 y 1 y A 4 NULL NULL YES BTREE
9+
t 0 PRIMARY 1 id A 5 NULL NULL BTREE
10+
t 1 x 1 x A 5 NULL NULL YES BTREE
11+
t 1 y 1 y A 5 NULL NULL YES BTREE
1212
alter table t analyze partition p0;
1313
Table Op Msg_type Msg_text
1414
test.t analyze status OK
1515
show indexes from t;
1616
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
17-
t 0 PRIMARY 1 id A 4 NULL NULL BTREE
18-
t 1 x 1 x A 4 NULL NULL YES BTREE
19-
t 1 y 1 y A 4 NULL NULL YES BTREE
17+
t 0 PRIMARY 1 id A 5 NULL NULL BTREE
18+
t 1 x 1 x A 5 NULL NULL YES BTREE
19+
t 1 y 1 y A 5 NULL NULL YES BTREE
2020
alter table t analyze partition p1;
2121
Table Op Msg_type Msg_text
2222
test.t analyze status OK
2323
show indexes from t;
2424
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
25-
t 0 PRIMARY 1 id A 4 NULL NULL BTREE
26-
t 1 x 1 x A 4 NULL NULL YES BTREE
27-
t 1 y 1 y A 4 NULL NULL YES BTREE
25+
t 0 PRIMARY 1 id A 5 NULL NULL BTREE
26+
t 1 x 1 x A 5 NULL NULL YES BTREE
27+
t 1 y 1 y A 5 NULL NULL YES BTREE
2828
insert into t values (100,1,1),(200,2,1),(300,3,1),(400,4,1),(500,5,1);
2929
show indexes from t;
3030
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment

0 commit comments

Comments
 (0)