summaryrefslogtreecommitdiff
path: root/storage/tokudb/mysql-test/rpl/r/rpl_parallel_tokudb_write_pk.result
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2018-09-14 08:47:22 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2018-09-14 08:47:22 +0200
commit28f08d3753eb10a1393a63e6c581d43aad9f93b9 (patch)
tree86c9df8c3fb6d4ebd99d431697c84f06ef242989 /storage/tokudb/mysql-test/rpl/r/rpl_parallel_tokudb_write_pk.result
parent38665893087e20c3ad65d5b0e227a75185a4865e (diff)
parentf1bcfbb4373e40dda2c18c137f76fc6ff32e1a45 (diff)
downloadmariadb-git-28f08d3753eb10a1393a63e6c581d43aad9f93b9.tar.gz
Merge branch '10.1' into 10.2
Diffstat (limited to 'storage/tokudb/mysql-test/rpl/r/rpl_parallel_tokudb_write_pk.result')
-rw-r--r--storage/tokudb/mysql-test/rpl/r/rpl_parallel_tokudb_write_pk.result2
1 files changed, 0 insertions, 2 deletions
diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_parallel_tokudb_write_pk.result b/storage/tokudb/mysql-test/rpl/r/rpl_parallel_tokudb_write_pk.result
index 1de619eb4ec..0ae63f0d02f 100644
--- a/storage/tokudb/mysql-test/rpl/r/rpl_parallel_tokudb_write_pk.result
+++ b/storage/tokudb/mysql-test/rpl/r/rpl_parallel_tokudb_write_pk.result
@@ -5,8 +5,6 @@ drop table if exists t;
connection slave;
show variables like 'tokudb_rpl_unique_checks%';
Variable_name Value
-tokudb_rpl_unique_checks OFF
-tokudb_rpl_unique_checks_delay 5000
connection master;
create table t (a bigint not null, primary key(a)) engine=tokudb;
insert into t values (1);