Skip to content

Commit dcc501a

Browse files
vuvovavuvova
committed
5.6.27-76.0
1 parent 2c8c652 commit dcc501a

File tree

206 files changed

+15619
-5969
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+15619
-5969
lines changed

‎mysql-test/suite/tokudb.add_index/t/suite.opt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
$TOKUDB_OPT $TOKUDB_LOAD_ADD --loose-tokudb-check-jemalloc=0

‎mysql-test/suite/tokudb.alter_table/t/suite.opt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
$TOKUDB_OPT $TOKUDB_LOAD_ADD --loose-tokudb-check-jemalloc=0

‎mysql-test/suite/tokudb.bugs/r/db756_card_part_hash.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ create table t (id int, x int, primary key (id), key (x)) partition by hash(id)
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
66
t 0 PRIMARY 1 id A 2 NULL NULL BTREE
7-
t 1 x 1 x A NULL NULL NULL YES 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;
1111
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
1212
t 0 PRIMARY 1 id A 6 NULL NULL BTREE
13-
t 1 x 1 x A NULL NULL NULL YES BTREE
13+
t 1 x 1 x A 6 NULL NULL YES BTREE
1414
analyze table t;
1515
Table Op Msg_type Msg_text
1616
test.t analyze status OK
1717
show indexes from t;
1818
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
1919
t 0 PRIMARY 1 id A 6 NULL NULL BTREE
20-
t 1 x 1 x A 2 NULL NULL YES BTREE
20+
t 1 x 1 x A 6 NULL NULL YES BTREE
2121
drop table t;

‎mysql-test/suite/tokudb.bugs/r/db756_card_part_hash_1.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ create table t (id int, x int, primary key (id), key (x)) partition by hash(id)
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
66
t 0 PRIMARY 1 id A 2 NULL NULL BTREE
7-
t 1 x 1 x A NULL NULL NULL YES 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
1111
t 0 PRIMARY 1 id A 4 NULL NULL BTREE
12-
t 1 x 1 x A NULL NULL NULL YES 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
1818
t 0 PRIMARY 1 id A 4 NULL NULL BTREE
19-
t 1 x 1 x A 1 NULL NULL YES BTREE
19+
t 1 x 1 x A 4 NULL NULL YES BTREE
2020
drop table t;

‎mysql-test/suite/tokudb.bugs/r/db756_card_part_hash_1_pick.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ create table t (id int, x int, primary key (id), key (x)) partition by hash(id)
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
66
t 0 PRIMARY 1 id A 2 NULL NULL BTREE
7-
t 1 x 1 x A NULL NULL NULL YES 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;
1111
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
1212
t 0 PRIMARY 1 id A 7 NULL NULL BTREE
13-
t 1 x 1 x A NULL NULL NULL YES BTREE
13+
t 1 x 1 x A 7 NULL NULL YES BTREE
1414
analyze table t;
1515
Table Op Msg_type Msg_text
1616
test.t analyze status OK
1717
show indexes from t;
1818
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
1919
t 0 PRIMARY 1 id A 7 NULL NULL BTREE
20-
t 1 x 1 x A 1 NULL NULL YES BTREE
20+
t 1 x 1 x A 7 NULL NULL YES BTREE
2121
drop table t;

‎mysql-test/suite/tokudb.bugs/r/db756_card_part_hash_2.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ create table t (id int, x int, primary key (id), key (x)) partition by hash(id)
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
66
t 0 PRIMARY 1 id A 2 NULL NULL BTREE
7-
t 1 x 1 x A NULL NULL NULL YES 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
1111
t 0 PRIMARY 1 id A 4 NULL NULL BTREE
12-
t 1 x 1 x A NULL NULL NULL YES 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
1818
t 0 PRIMARY 1 id A 4 NULL NULL BTREE
19-
t 1 x 1 x A 1 NULL NULL YES BTREE
19+
t 1 x 1 x A 4 NULL NULL YES BTREE
2020
drop table t;

‎mysql-test/suite/tokudb.bugs/r/db756_card_part_hash_2_pick.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ create table t (id int, x int, primary key (id), key (x)) partition by hash(id)
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
66
t 0 PRIMARY 1 id A 2 NULL NULL BTREE
7-
t 1 x 1 x A NULL NULL NULL YES 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;
1111
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
1212
t 0 PRIMARY 1 id A 7 NULL NULL BTREE
13-
t 1 x 1 x A NULL NULL NULL YES BTREE
13+
t 1 x 1 x A 7 NULL NULL YES BTREE
1414
analyze table t;
1515
Table Op Msg_type Msg_text
1616
test.t analyze status OK

‎mysql-test/suite/tokudb.bugs/r/db757_part_alter_analyze.result

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,44 +7,44 @@ 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
99
t 0 PRIMARY 1 id A 5 NULL NULL BTREE
10-
t 1 x 1 x A NULL NULL NULL YES BTREE
11-
t 1 y 1 y A NULL NULL NULL YES 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
1717
t 0 PRIMARY 1 id A 5 NULL NULL BTREE
18-
t 1 x 1 x A 1 NULL NULL YES BTREE
18+
t 1 x 1 x A 5 NULL NULL YES BTREE
1919
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
2525
t 0 PRIMARY 1 id A 5 NULL NULL BTREE
26-
t 1 x 1 x A 1 NULL NULL YES BTREE
26+
t 1 x 1 x A 5 NULL NULL YES BTREE
2727
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
3131
t 0 PRIMARY 1 id A 9 NULL NULL BTREE
32-
t 1 x 1 x A 2 NULL NULL YES BTREE
32+
t 1 x 1 x A 9 NULL NULL YES BTREE
3333
t 1 y 1 y A 9 NULL NULL YES BTREE
3434
alter table t analyze partition p0;
3535
Table Op Msg_type Msg_text
3636
test.t analyze status OK
3737
show indexes from t;
3838
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
3939
t 0 PRIMARY 1 id A 9 NULL NULL BTREE
40-
t 1 x 1 x A NULL NULL NULL YES BTREE
41-
t 1 y 1 y A NULL NULL NULL YES BTREE
40+
t 1 x 1 x A 9 NULL NULL YES BTREE
41+
t 1 y 1 y A 9 NULL NULL YES BTREE
4242
alter table t analyze partition p1;
4343
Table Op Msg_type Msg_text
4444
test.t analyze status OK
4545
show indexes from t;
4646
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
4747
t 0 PRIMARY 1 id A 9 NULL NULL BTREE
4848
t 1 x 1 x A 9 NULL NULL YES BTREE
49-
t 1 y 1 y A 1 NULL NULL YES BTREE
49+
t 1 y 1 y A 4 NULL NULL YES BTREE
5050
drop table t;

‎mysql-test/suite/tokudb.bugs/t/5585-master.opt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
--tokudb-cache-size=1000000000 --innodb-buffer-pool-size=1000000000
1+
--loose-tokudb-cache-size=1000000000 --innodb-buffer-pool-size=1000000000

‎mysql-test/suite/tokudb.bugs/t/5585.test

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
--source include/have_innodb.inc
22
--source include/have_tokudb.inc
3+
--source include/big_test.inc
34

45
--disable_warnings
56
drop table if exists t1, t2;
@@ -64,4 +65,4 @@ select t1.file_id,
6465
(select hits from t2 where t2.file_id = t1.file_id and t2.insert_ts = date(date_sub(now(),interval 1 day))) as d
6566
from t1;
6667

67-
drop table if exists t1, t2;
68+
drop table if exists t1, t2;

0 commit comments

Comments
 (0)