Skip to content

M
MariaDB
Commit 22d7860d authored by Sergei Golubchik's avatar Sergei Golubchik
Browse files
Options

fix tokudb tests after the merge

parent dde558f2
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 48 deletions
storage/tokudb/mysql-test/tokudb/r/card_auto_analyze_lots.result
View file @ 22d7860d
...@@ -798,3 +798,8 @@ SHOW INDEX FROM ar_1; ...@@ -798,3 +798,8 @@ SHOW INDEX FROM ar_1;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
ar_1 0 PRIMARY 1 a A 1 NULL NULL BTREE ar_1 0 PRIMARY 1 a A 1 NULL NULL BTREE
ar_1 1 bkey 1 b A 1 NULL NULL YES BTREE ar_1 1 bkey 1 b A 1 NULL NULL YES BTREE
SET SESSION tokudb_auto_analyze = @orig_auto_analyze;
SET SESSION tokudb_analyze_in_background = @orig_in_background;
SET SESSION tokudb_analyze_mode = @orig_mode;
SET SESSION tokudb_analyze_throttle = @orig_throttle;
SET SESSION tokudb_analyze_time = @orig_time;
storage/tokudb/mysql-test/tokudb_bugs/disabled.def
View file @ 22d7860d
5585: times out, too many huge insert...selects 5585: times out, too many huge insert...selects
db233: different execution path in mariadb, debug_sync point is not hit
storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock.result
View file @ 22d7860d
SET DEFAULT_STORAGE_ENGINE = 'tokudb'; SET DEFAULT_STORAGE_ENGINE = 'tokudb';
set global tokudb_checkpoint_on_flush_logs=ON; set global tokudb_checkpoint_on_flush_logs=ON;
# Establish connection conn1 (user = root) # Establish connection conn1 (user = root)
select DB, command, state, info from information_schema.processlist order by info; select DB, command, state, info from information_schema.processlist where id != connection_id();
DB command state info DB command state info
test Sleep NULL test Sleep NULL
test Query Filling schema table select DB, command, state, info from information_schema.processlist order by info
flush logs; flush logs;
select DB, command, state, info from information_schema.processlist order by info; select DB, command, state, info from information_schema.processlist where id != connection_id();
DB command state info DB command state info
test Sleep NULL test Sleep NULL
test Query Filling schema table select DB, command, state, info from information_schema.processlist order by info
set tokudb_checkpoint_lock=1; set tokudb_checkpoint_lock=1;
flush logs;; flush logs;;
select DB, command, state, info from information_schema.processlist order by info; select DB, command, state, info from information_schema.processlist where id != connection_id();
DB command state info DB command state info
test Query init flush logs test Query init flush logs
test Query Filling schema table select DB, command, state, info from information_schema.processlist order by info
set tokudb_checkpoint_lock=0; set tokudb_checkpoint_lock=0;
set global tokudb_checkpoint_on_flush_logs=OFF; set global tokudb_checkpoint_on_flush_logs=OFF;
storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock_3.result
View file @ 22d7860d
SET DEFAULT_STORAGE_ENGINE = 'tokudb'; SET DEFAULT_STORAGE_ENGINE = 'tokudb';
# Establish connection conn1 (user = root) # Establish connection conn1 (user = root)
select DB, command, state, info from information_schema.processlist order by info; select DB, command, state, info from information_schema.processlist where id != connection_id();
DB command state info DB command state info
test Sleep NULL test Sleep NULL
test Query Filling schema table select DB, command, state, info from information_schema.processlist order by info
flush logs; flush logs;
select DB, command, state, info from information_schema.processlist order by info; select DB, command, state, info from information_schema.processlist where id != connection_id();
DB command state info DB command state info
test Sleep NULL test Sleep NULL
test Query Filling schema table select DB, command, state, info from information_schema.processlist order by info
set tokudb_checkpoint_lock=1; set tokudb_checkpoint_lock=1;
flush logs;; flush logs;;
select DB, command, state, info from information_schema.processlist order by info; select DB, command, state, info from information_schema.processlist where id != connection_id();
DB command state info DB command state info
test Sleep NULL test Sleep NULL
test Query Filling schema table select DB, command, state, info from information_schema.processlist order by info
set tokudb_checkpoint_lock=0; set tokudb_checkpoint_lock=0;
storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash.result
View file @ 22d7860d
...@@ -3,8 +3,8 @@ drop table if exists t; ...@@ -3,8 +3,8 @@ drop table if exists t;
create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2; create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2;
show indexes from t; show indexes from t;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
t 0 PRIMARY 1 id A 0 NULL NULL BTREE t 0 PRIMARY 1 id A 2 NULL NULL BTREE
t 1 x 1 x A 0 NULL NULL YES BTREE t 1 x 1 x A 2 NULL NULL YES BTREE
insert into t values (1,1),(3,1),(5,1); insert into t values (1,1),(3,1),(5,1);
insert into t values (2,1),(4,1),(6,1); insert into t values (2,1),(4,1),(6,1);
show indexes from t; show indexes from t;
......
storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_1.result
View file @ 22d7860d
...@@ -3,18 +3,18 @@ drop table if exists t; ...@@ -3,18 +3,18 @@ drop table if exists t;
create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2; create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2;
show indexes from t; show indexes from t;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
t 0 PRIMARY 1 id A 0 NULL NULL BTREE t 0 PRIMARY 1 id A 2 NULL NULL BTREE
t 1 x 1 x A 0 NULL NULL YES BTREE t 1 x 1 x A 2 NULL NULL YES BTREE
insert into t values (1,1),(3,1),(5,1); insert into t values (1,1),(3,1),(5,1);
show indexes from t; show indexes from t;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
t 0 PRIMARY 1 id A 3 NULL NULL BTREE t 0 PRIMARY 1 id A 4 NULL NULL BTREE
t 1 x 1 x A 3 NULL NULL YES BTREE t 1 x 1 x A 4 NULL NULL YES BTREE
analyze table t; analyze table t;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t analyze status OK test.t analyze status OK
show indexes from t; show indexes from t;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
t 0 PRIMARY 1 id A 3 NULL NULL BTREE t 0 PRIMARY 1 id A 4 NULL NULL BTREE
t 1 x 1 x A 3 NULL NULL YES BTREE t 1 x 1 x A 4 NULL NULL YES BTREE
drop table t; drop table t;
storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_1_pick.result
View file @ 22d7860d
...@@ -3,8 +3,8 @@ drop table if exists t; ...@@ -3,8 +3,8 @@ drop table if exists t;
create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2; create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2;
show indexes from t; show indexes from t;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
t 0 PRIMARY 1 id A 0 NULL NULL BTREE t 0 PRIMARY 1 id A 2 NULL NULL BTREE
t 1 x 1 x A 0 NULL NULL YES BTREE t 1 x 1 x A 2 NULL NULL YES BTREE
insert into t values (1,1),(3,2),(5,3); insert into t values (1,1),(3,2),(5,3);
insert into t values (2,1),(4,1),(6,1),(8,1); insert into t values (2,1),(4,1),(6,1),(8,1);
show indexes from t; show indexes from t;
......
storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_2.result
View file @ 22d7860d
...@@ -3,18 +3,18 @@ drop table if exists t; ...@@ -3,18 +3,18 @@ drop table if exists t;
create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2; create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2;
show indexes from t; show indexes from t;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
t 0 PRIMARY 1 id A 0 NULL NULL BTREE t 0 PRIMARY 1 id A 2 NULL NULL BTREE
t 1 x 1 x A 0 NULL NULL YES BTREE t 1 x 1 x A 2 NULL NULL YES BTREE
insert into t values (2,1),(4,1),(6,1); insert into t values (2,1),(4,1),(6,1);
show indexes from t; show indexes from t;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
t 0 PRIMARY 1 id A 3 NULL NULL BTREE t 0 PRIMARY 1 id A 4 NULL NULL BTREE
t 1 x 1 x A 3 NULL NULL YES BTREE t 1 x 1 x A 4 NULL NULL YES BTREE
analyze table t; analyze table t;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t analyze status OK test.t analyze status OK
show indexes from t; show indexes from t;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
t 0 PRIMARY 1 id A 3 NULL NULL BTREE t 0 PRIMARY 1 id A 4 NULL NULL BTREE
t 1 x 1 x A 3 NULL NULL YES BTREE t 1 x 1 x A 4 NULL NULL YES BTREE
drop table t; drop table t;
storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_2_pick.result
View file @ 22d7860d
...@@ -3,8 +3,8 @@ drop table if exists t; ...@@ -3,8 +3,8 @@ drop table if exists t;
create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2; create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2;
show indexes from t; show indexes from t;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
t 0 PRIMARY 1 id A 0 NULL NULL BTREE t 0 PRIMARY 1 id A 2 NULL NULL BTREE
t 1 x 1 x A 0 NULL NULL YES BTREE t 1 x 1 x A 2 NULL NULL YES BTREE
insert into t values (1,1),(3,2),(5,3),(7,4); insert into t values (1,1),(3,2),(5,3),(7,4);
insert into t values (2,1),(4,1),(6,1); insert into t values (2,1),(4,1),(6,1);
show indexes from t; show indexes from t;
......
storage/tokudb/mysql-test/tokudb_bugs/r/db757_part_alter_analyze.result
View file @ 22d7860d
...@@ -6,25 +6,25 @@ partition by range(id) ...@@ -6,25 +6,25 @@ partition by range(id)
insert into t values (1,1,1),(2,1,2),(3,1,3),(4,1,4); insert into t values (1,1,1),(2,1,2),(3,1,3),(4,1,4);
show indexes from t; show indexes from t;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
t 0 PRIMARY 1 id A 4 NULL NULL BTREE t 0 PRIMARY 1 id A 5 NULL NULL BTREE
t 1 x 1 x A 4 NULL NULL YES BTREE t 1 x 1 x A 5 NULL NULL YES BTREE
t 1 y 1 y A 4 NULL NULL YES BTREE t 1 y 1 y A 5 NULL NULL YES BTREE
alter table t analyze partition p0; alter table t analyze partition p0;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t analyze status OK test.t analyze status OK
show indexes from t; show indexes from t;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
t 0 PRIMARY 1 id A 4 NULL NULL BTREE t 0 PRIMARY 1 id A 5 NULL NULL BTREE
t 1 x 1 x A 4 NULL NULL YES BTREE t 1 x 1 x A 5 NULL NULL YES BTREE
t 1 y 1 y A 4 NULL NULL YES BTREE t 1 y 1 y A 5 NULL NULL YES BTREE
alter table t analyze partition p1; alter table t analyze partition p1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t analyze status OK test.t analyze status OK
show indexes from t; show indexes from t;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
t 0 PRIMARY 1 id A 4 NULL NULL BTREE t 0 PRIMARY 1 id A 5 NULL NULL BTREE
t 1 x 1 x A 4 NULL NULL YES BTREE t 1 x 1 x A 5 NULL NULL YES BTREE
t 1 y 1 y A 4 NULL NULL YES BTREE t 1 y 1 y A 5 NULL NULL YES BTREE
insert into t values (100,1,1),(200,2,1),(300,3,1),(400,4,1),(500,5,1); insert into t values (100,1,1),(200,2,1),(300,3,1),(400,4,1),(500,5,1);
show indexes from t; show indexes from t;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
......
storage/tokudb/mysql-test/tokudb_bugs/r/db945.result
View file @ 22d7860d
...@@ -10,3 +10,4 @@ lock tables t1 write, t1 as a read, t1 as b read; ...@@ -10,3 +10,4 @@ lock tables t1 write, t1 as a read, t1 as b read;
insert into t1(a) values(1); insert into t1(a) values(1);
alter table t1 drop key a; alter table t1 drop key a;
unlock tables; unlock tables;
drop table t1;
storage/tokudb/mysql-test/tokudb_bugs/r/simple_icp.result
View file @ 22d7860d
...@@ -110,7 +110,7 @@ a b c d e ...@@ -110,7 +110,7 @@ a b c d e
5 1 10 NULL NULL 5 1 10 NULL NULL
show status like '%Handler_read_prev%'; show status like '%Handler_read_prev%';
Variable_name Value Variable_name Value
Handler_read_prev 799 Handler_read_prev 800
flush status; flush status;
show status like '%Handler_read_prev%'; show status like '%Handler_read_prev%';
Variable_name Value Variable_name Value
...@@ -142,7 +142,7 @@ a b c d e ...@@ -142,7 +142,7 @@ a b c d e
20 1 10 NULL NULL 20 1 10 NULL NULL
show status like '%Handler_read_prev%'; show status like '%Handler_read_prev%';
Variable_name Value Variable_name Value
Handler_read_prev 399 Handler_read_prev 400
flush status; flush status;
show status like '%Handler_read_next%'; show status like '%Handler_read_next%';
Variable_name Value Variable_name Value
......
storage/tokudb/mysql-test/tokudb_bugs/t/checkpoint_lock.test
View file @ 22d7860d
...@@ -8,9 +8,9 @@ connect (conn1,localhost,root,,); ...@@ -8,9 +8,9 @@ connect (conn1,localhost,root,,);
connection default; connection default;
--sleep 2 --sleep 2
select DB, command, state, info from information_schema.processlist order by info; select DB, command, state, info from information_schema.processlist where id != connection_id();
flush logs; flush logs;
select DB, command, state, info from information_schema.processlist order by info; select DB, command, state, info from information_schema.processlist where id != connection_id();
connection conn1; connection conn1;
set tokudb_checkpoint_lock=1; set tokudb_checkpoint_lock=1;
...@@ -20,7 +20,7 @@ connection default; ...@@ -20,7 +20,7 @@ connection default;
connection conn1; connection conn1;
--sleep 2 --sleep 2
select DB, command, state, info from information_schema.processlist order by info; select DB, command, state, info from information_schema.processlist where id != connection_id();
set tokudb_checkpoint_lock=0; set tokudb_checkpoint_lock=0;
connection default; connection default;
......
storage/tokudb/mysql-test/tokudb_bugs/t/checkpoint_lock_3.test
View file @ 22d7860d
...@@ -7,9 +7,9 @@ connect (conn1,localhost,root,,); ...@@ -7,9 +7,9 @@ connect (conn1,localhost,root,,);
connection default; connection default;
--sleep 2 --sleep 2
select DB, command, state, info from information_schema.processlist order by info; select DB, command, state, info from information_schema.processlist where id != connection_id();
flush logs; flush logs;
select DB, command, state, info from information_schema.processlist order by info; select DB, command, state, info from information_schema.processlist where id != connection_id();
connection conn1; connection conn1;
set tokudb_checkpoint_lock=1; set tokudb_checkpoint_lock=1;
...@@ -19,7 +19,7 @@ connection default; ...@@ -19,7 +19,7 @@ connection default;
connection conn1; connection conn1;
--sleep 2 --sleep 2
select DB, command, state, info from information_schema.processlist order by info; select DB, command, state, info from information_schema.processlist where id != connection_id();
set tokudb_checkpoint_lock=0; set tokudb_checkpoint_lock=0;
connection default; connection default;
......
storage/tokudb/mysql-test/tokudb_bugs/t/db917.test
View file @ 22d7860d
# test DB-917 # test DB-917
# test that table/share open lock timeout does not crash the server on subsequent access # test that table/share open lock timeout does not crash the server on subsequent access
source include/have_partition.inc;
source include/have_tokudb.inc; source include/have_tokudb.inc;
disable_warnings; disable_warnings;
drop table if exists t1; drop table if exists t1;
......
storage/tokudb/mysql-test/tokudb_mariadb/r/mdev5426.result
View file @ 22d7860d
CREATE TABLE t1 (i INT) ENGINE=TokuDB; CREATE TABLE t1 (i INT) ENGINE=TokuDB;
EXPLAIN INSERT INTO t1 SELECT * FROM t1; EXPLAIN INSERT INTO t1 SELECT * FROM t1;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 0 Using temporary 1 SIMPLE t1 ALL NULL NULL NULL NULL 1 Using temporary
INSERT INTO t1 SELECT * FROM t1; INSERT INTO t1 SELECT * FROM t1;
DROP TABLE t1; DROP TABLE t1;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7