5.6.27-76.0

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

+$TOKUDB_OPT $TOKUDB_LOAD_ADD --loose-tokudb-check-jemalloc=0

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

+$TOKUDB_OPT $TOKUDB_LOAD_ADD --loose-tokudb-check-jemalloc=0

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

@@ -4,18 +4,18 @@ create table t (id int, x int, primary key (id), key (x)) partition by hash(id)
 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
 t	0	PRIMARY	1	id	A	2	NULL	NULL		BTREE		
-t	1	x	1	x	A	NULL	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 (2,1),(4,1),(6,1);
 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
 t	0	PRIMARY	1	id	A	6	NULL	NULL		BTREE		
-t	1	x	1	x	A	NULL	NULL	NULL	YES	BTREE		
+t	1	x	1	x	A	6	NULL	NULL	YES	BTREE		
 analyze table t;
 Table	Op	Msg_type	Msg_text
 test.t	analyze	status	OK
 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
 t	0	PRIMARY	1	id	A	6	NULL	NULL		BTREE		
-t	1	x	1	x	A	2	NULL	NULL	YES	BTREE		
+t	1	x	1	x	A	6	NULL	NULL	YES	BTREE		
 drop table t;

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

@@ -4,17 +4,17 @@ create table t (id int, x int, primary key (id), key (x)) partition by hash(id)
 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
 t	0	PRIMARY	1	id	A	2	NULL	NULL		BTREE		
-t	1	x	1	x	A	NULL	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);
 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
 t	0	PRIMARY	1	id	A	4	NULL	NULL		BTREE		
-t	1	x	1	x	A	NULL	NULL	NULL	YES	BTREE		
+t	1	x	1	x	A	4	NULL	NULL	YES	BTREE		
 analyze table t;
 Table	Op	Msg_type	Msg_text
 test.t	analyze	status	OK
 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
 t	0	PRIMARY	1	id	A	4	NULL	NULL		BTREE		
-t	1	x	1	x	A	1	NULL	NULL	YES	BTREE		
+t	1	x	1	x	A	4	NULL	NULL	YES	BTREE		
 drop table t;

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

@@ -4,18 +4,18 @@ create table t (id int, x int, primary key (id), key (x)) partition by hash(id)
 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
 t	0	PRIMARY	1	id	A	2	NULL	NULL		BTREE		
-t	1	x	1	x	A	NULL	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 (2,1),(4,1),(6,1),(8,1);
 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
 t	0	PRIMARY	1	id	A	7	NULL	NULL		BTREE		
-t	1	x	1	x	A	NULL	NULL	NULL	YES	BTREE		
+t	1	x	1	x	A	7	NULL	NULL	YES	BTREE		
 analyze table t;
 Table	Op	Msg_type	Msg_text
 test.t	analyze	status	OK
 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
 t	0	PRIMARY	1	id	A	7	NULL	NULL		BTREE		
-t	1	x	1	x	A	1	NULL	NULL	YES	BTREE		
+t	1	x	1	x	A	7	NULL	NULL	YES	BTREE		
 drop table t;

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

@@ -4,17 +4,17 @@ create table t (id int, x int, primary key (id), key (x)) partition by hash(id)
 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
 t	0	PRIMARY	1	id	A	2	NULL	NULL		BTREE		
-t	1	x	1	x	A	NULL	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);
 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
 t	0	PRIMARY	1	id	A	4	NULL	NULL		BTREE		
-t	1	x	1	x	A	NULL	NULL	NULL	YES	BTREE		
+t	1	x	1	x	A	4	NULL	NULL	YES	BTREE		
 analyze table t;
 Table	Op	Msg_type	Msg_text
 test.t	analyze	status	OK
 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
 t	0	PRIMARY	1	id	A	4	NULL	NULL		BTREE		
-t	1	x	1	x	A	1	NULL	NULL	YES	BTREE		
+t	1	x	1	x	A	4	NULL	NULL	YES	BTREE		
 drop table t;

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

@@ -4,13 +4,13 @@ create table t (id int, x int, primary key (id), key (x)) partition by hash(id)
 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
 t	0	PRIMARY	1	id	A	2	NULL	NULL		BTREE		
-t	1	x	1	x	A	NULL	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 (2,1),(4,1),(6,1);
 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
 t	0	PRIMARY	1	id	A	7	NULL	NULL		BTREE		
-t	1	x	1	x	A	NULL	NULL	NULL	YES	BTREE		
+t	1	x	1	x	A	7	NULL	NULL	YES	BTREE		
 analyze table t;
 Table	Op	Msg_type	Msg_text
 test.t	analyze	status	OK

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

@@ -7,15 +7,15 @@ insert into t values (1,1,1),(2,1,2),(3,1,3),(4,1,4);
 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
 t	0	PRIMARY	1	id	A	5	NULL	NULL		BTREE		
-t	1	x	1	x	A	NULL	NULL	NULL	YES	BTREE		
-t	1	y	1	y	A	NULL	NULL	NULL	YES	BTREE		
+t	1	x	1	x	A	5	NULL	NULL	YES	BTREE		
+t	1	y	1	y	A	5	NULL	NULL	YES	BTREE		
 alter table t analyze partition p0;
 Table	Op	Msg_type	Msg_text
 test.t	analyze	status	OK
 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
 t	0	PRIMARY	1	id	A	5	NULL	NULL		BTREE		
-t	1	x	1	x	A	1	NULL	NULL	YES	BTREE		
+t	1	x	1	x	A	5	NULL	NULL	YES	BTREE		
 t	1	y	1	y	A	5	NULL	NULL	YES	BTREE		
 alter table t analyze partition p1;
 Table	Op	Msg_type	Msg_text
@@ -23,13 +23,13 @@ test.t	analyze	status	OK
 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
 t	0	PRIMARY	1	id	A	5	NULL	NULL		BTREE		
-t	1	x	1	x	A	1	NULL	NULL	YES	BTREE		
+t	1	x	1	x	A	5	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);
 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
 t	0	PRIMARY	1	id	A	9	NULL	NULL		BTREE		
-t	1	x	1	x	A	2	NULL	NULL	YES	BTREE		
+t	1	x	1	x	A	9	NULL	NULL	YES	BTREE		
 t	1	y	1	y	A	9	NULL	NULL	YES	BTREE		
 alter table t analyze partition p0;
 Table	Op	Msg_type	Msg_text
@@ -37,8 +37,8 @@ test.t	analyze	status	OK
 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
 t	0	PRIMARY	1	id	A	9	NULL	NULL		BTREE		
-t	1	x	1	x	A	NULL	NULL	NULL	YES	BTREE		
-t	1	y	1	y	A	NULL	NULL	NULL	YES	BTREE		
+t	1	x	1	x	A	9	NULL	NULL	YES	BTREE		
+t	1	y	1	y	A	9	NULL	NULL	YES	BTREE		
 alter table t analyze partition p1;
 Table	Op	Msg_type	Msg_text
 test.t	analyze	status	OK
@@ -46,5 +46,5 @@ 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
 t	0	PRIMARY	1	id	A	9	NULL	NULL		BTREE		
 t	1	x	1	x	A	9	NULL	NULL	YES	BTREE		
-t	1	y	1	y	A	1	NULL	NULL	YES	BTREE		
+t	1	y	1	y	A	4	NULL	NULL	YES	BTREE		
 drop table t;

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

---tokudb-cache-size=1000000000 --innodb-buffer-pool-size=1000000000
+--loose-tokudb-cache-size=1000000000 --innodb-buffer-pool-size=1000000000

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

 --source include/have_innodb.inc
 --source include/have_tokudb.inc
+--source include/big_test.inc
 
 --disable_warnings
 drop table if exists t1, t2;
@@ -64,4 +65,4 @@ select t1.file_id,
        (select hits from t2 where t2.file_id = t1.file_id and t2.insert_ts = date(date_sub(now(),interval 1 day))) as d
 from t1;
 
-drop table if exists t1, t2;
\ No newline at end of file
+drop table if exists t1, t2;

mysql-test/suite/tokudb.bugs/t/disabled.def

@@ -11,3 +11,6 @@ checkpoint_lock_2: test can not work when the checkpoint_safe_lock is a fair rwl
 6053: tokudb is not the default storage engine
 1883: tokutek's auto inc singleton patch missing
 3083: no patch to find_shortest_key to prefer PK over CK
+db768 : https://tokutek.atlassian.net/browse/DB-768
+dict_leak_3518 : https://tokutek.atlassian.net/browse/DB-635
+1872 : https://tokutek.atlassian.net/browse/DB-750

mysql-test/suite/tokudb.bugs/t/suite.opt

+$TOKUDB_OPT $TOKUDB_LOAD_ADD --loose-tokudb-check-jemalloc=0

mysql-test/suite/tokudb.parts/r/partition_auto_increment_tokudb.result

+SET @tokudb_prelock_empty_saved = @@GLOBAL.tokudb_prelock_empty;
+SET GLOBAL tokudb_prelock_empty = 0;
+SET SESSION tokudb_prelock_empty = 0;
 DROP TABLE IF EXISTS t1;
 # test without partitioning for reference
 CREATE TABLE t1 (
@@ -1113,3 +1116,4 @@ a
 0
 DROP TABLE t1;
 ##############################################################################
+SET GLOBAL tokudb_prelock_empty = @tokudb_prelock_empty_saved;

mysql-test/suite/tokudb.parts/t/disabled.def

 partition_basic_symlink_tokudb : tokudb_file_per_table is not supported
 partition_reorganize_tokudb : tokudb_file_per_table is not supported
+partition_mgm_lc0_tokudb : https://tokutek.atlassian.net/browse/DB-637
+partition_mgm_lc1_tokudb : https://tokutek.atlassian.net/browse/DB-637

mysql-test/suite/tokudb.parts/t/partition_auto_increment_tokudb-master.opt

---tokudb-prelock-empty=0

mysql-test/suite/tokudb.parts/t/partition_auto_increment_tokudb.test

@@ -29,7 +29,12 @@
 let $engine= 'TokuDB';
 --source include/have_tokudb.inc
 
+SET @tokudb_prelock_empty_saved = @@GLOBAL.tokudb_prelock_empty;
+SET GLOBAL tokudb_prelock_empty = 0;
+SET SESSION tokudb_prelock_empty = 0;
+
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
 --source suite/parts/inc/partition_auto_increment.inc
 
+SET GLOBAL tokudb_prelock_empty = @tokudb_prelock_empty_saved;

mysql-test/suite/tokudb.parts/t/suite.opt

+$TOKUDB_OPT $TOKUDB_LOAD_ADD --loose-tokudb-check-jemalloc=0

mysql-test/suite/tokudb.rpl/combinations

+[row]
+binlog-format=row
+
+[stmt]
+binlog-format=statement
+
+[mix]
+binlog-format=mixed

mysql-test/suite/tokudb.rpl/r/rpl_parallel_tokudb_delete_pk.result

@@ -6,6 +6,13 @@ Warnings:
 Note	1753	slave_transaction_retries is not supported in multi-threaded slave mode. In the event of a transient failure, the slave will not retry the transaction and will stop.
 [connection master]
 drop table if exists t;
+show variables like 'tokudb_rpl_%';
+Variable_name	Value
+tokudb_rpl_check_readonly	ON
+tokudb_rpl_lookup_rows	OFF
+tokudb_rpl_lookup_rows_delay	10000
+tokudb_rpl_unique_checks	OFF
+tokudb_rpl_unique_checks_delay	10000
 create table t (a bigint not null, primary key(a)) engine=tokudb;
 insert into t values (1);
 insert into t values (2),(3);

mysql-test/suite/tokudb.rpl/r/rpl_parallel_tokudb_update_pk_uc0_lookup0.result

@@ -6,6 +6,13 @@ Warnings:
 Note	1753	slave_transaction_retries is not supported in multi-threaded slave mode. In the event of a transient failure, the slave will not retry the transaction and will stop.
 [connection master]
 drop table if exists t;
+show variables like 'tokudb_rpl_%';
+Variable_name	Value
+tokudb_rpl_check_readonly	ON
+tokudb_rpl_lookup_rows	OFF
+tokudb_rpl_lookup_rows_delay	10000
+tokudb_rpl_unique_checks	OFF
+tokudb_rpl_unique_checks_delay	10000
 create table t (a bigint not null, b bigint not null, primary key(a)) engine=tokudb;
 insert into t values (1,0);
 insert into t values (2,0),(3,0);

mysql-test/suite/tokudb.rpl/r/rpl_parallel_tokudb_write_pk.result

@@ -6,6 +6,10 @@ Warnings:
 Note	1753	slave_transaction_retries is not supported in multi-threaded slave mode. In the event of a transient failure, the slave will not retry the transaction and will stop.
 [connection master]
 drop table if exists t;
+show variables like 'tokudb_rpl_unique_checks%';
+Variable_name	Value
+tokudb_rpl_unique_checks	OFF
+tokudb_rpl_unique_checks_delay	5000
 create table t (a bigint not null, primary key(a)) engine=tokudb;
 select unix_timestamp() into @tstart;
 insert into t values (1);

mysql-test/suite/tokudb.rpl/r/rpl_tokudb_delete_pk.result

@@ -4,6 +4,13 @@ Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 drop table if exists t;
+show variables like 'tokudb_rpl_%';
+Variable_name	Value
+tokudb_rpl_check_readonly	ON
+tokudb_rpl_lookup_rows	OFF
+tokudb_rpl_lookup_rows_delay	10000
+tokudb_rpl_unique_checks	OFF
+tokudb_rpl_unique_checks_delay	10000
 create table t (a bigint not null, primary key(a)) engine=tokudb;
 insert into t values (1);
 insert into t values (2),(3);

mysql-test/suite/tokudb.rpl/r/rpl_tokudb_delete_pk_lookup1.result

@@ -4,6 +4,13 @@ Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 drop table if exists t;
+show variables like 'tokudb_rpl_%';
+Variable_name	Value
+tokudb_rpl_check_readonly	ON
+tokudb_rpl_lookup_rows	ON
+tokudb_rpl_lookup_rows_delay	10000
+tokudb_rpl_unique_checks	ON
+tokudb_rpl_unique_checks_delay	0
 create table t (a bigint not null, primary key(a)) engine=tokudb;
 insert into t values (1);
 insert into t values (2),(3);

mysql-test/suite/tokudb.rpl/r/rpl_tokudb_mixed_dml.result

+SET SESSION tokudb_pk_insert_mode = 2;
 include/master-slave.inc
 Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.

mysql-test/suite/tokudb.rpl/r/rpl_tokudb_read_only_ff.result

@@ -4,6 +4,13 @@ Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 drop table if exists t;
+show variables like 'tokudb_rpl%';
+Variable_name	Value
+tokudb_rpl_check_readonly	OFF
+tokudb_rpl_lookup_rows	ON
+tokudb_rpl_lookup_rows_delay	0
+tokudb_rpl_unique_checks	OFF
+tokudb_rpl_unique_checks_delay	5000
 create table t (a bigint not null, primary key(a)) engine=tokudb;
 select unix_timestamp() into @tstart;
 insert into t values (1);

mysql-test/suite/tokudb.rpl/r/rpl_tokudb_read_only_ft.result

@@ -4,6 +4,13 @@ Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 drop table if exists t;
+show variables like 'tokudb_rpl%';
+Variable_name	Value
+tokudb_rpl_check_readonly	ON
+tokudb_rpl_lookup_rows	ON
+tokudb_rpl_lookup_rows_delay	0
+tokudb_rpl_unique_checks	OFF
+tokudb_rpl_unique_checks_delay	5000
 create table t (a bigint not null, primary key(a)) engine=tokudb;
 select unix_timestamp() into @tstart;
 insert into t values (1);

mysql-test/suite/tokudb.rpl/r/rpl_tokudb_read_only_tf.result

@@ -4,6 +4,13 @@ Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 drop table if exists t;
+show variables like 'tokudb_rpl%';
+Variable_name	Value
+tokudb_rpl_check_readonly	OFF
+tokudb_rpl_lookup_rows	ON
+tokudb_rpl_lookup_rows_delay	0
+tokudb_rpl_unique_checks	OFF
+tokudb_rpl_unique_checks_delay	5000
 create table t (a bigint not null, primary key(a)) engine=tokudb;
 select unix_timestamp() into @tstart;
 insert into t values (1);

mysql-test/suite/tokudb.rpl/r/rpl_tokudb_read_only_tt.result

@@ -4,6 +4,13 @@ Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 drop table if exists t;
+show variables like 'tokudb_rpl%';
+Variable_name	Value
+tokudb_rpl_check_readonly	ON
+tokudb_rpl_lookup_rows	ON
+tokudb_rpl_lookup_rows_delay	0
+tokudb_rpl_unique_checks	OFF
+tokudb_rpl_unique_checks_delay	5000
 create table t (a bigint not null, primary key(a)) engine=tokudb;
 select unix_timestamp() into @tstart;
 insert into t values (1);

mysql-test/suite/tokudb.rpl/r/rpl_tokudb_update_pk_uc0_lookup0.result

@@ -4,6 +4,13 @@ Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 drop table if exists t;
+show variables like 'tokudb_rpl_%';
+Variable_name	Value
+tokudb_rpl_check_readonly	ON
+tokudb_rpl_lookup_rows	OFF
+tokudb_rpl_lookup_rows_delay	10000
+tokudb_rpl_unique_checks	OFF
+tokudb_rpl_unique_checks_delay	10000
 create table t (a bigint not null, b bigint not null, primary key(a)) engine=tokudb;
 insert into t values (1,0);
 insert into t values (2,0),(3,0);

mysql-test/suite/tokudb.rpl/r/rpl_tokudb_update_pk_uc0_lookup1.result

@@ -4,6 +4,13 @@ Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 drop table if exists t;
+show variables like 'tokudb_rpl_%';
+Variable_name	Value
+tokudb_rpl_check_readonly	ON
+tokudb_rpl_lookup_rows	ON
+tokudb_rpl_lookup_rows_delay	10000
+tokudb_rpl_unique_checks	OFF
+tokudb_rpl_unique_checks_delay	10000
 create table t (a bigint not null, b bigint not null, primary key(a)) engine=tokudb;
 insert into t values (1,0);
 insert into t values (2,0),(3,0);

mysql-test/suite/tokudb.rpl/r/rpl_tokudb_update_pk_uc1_lookup0.result

@@ -4,6 +4,13 @@ Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 drop table if exists t;
+show variables like 'tokudb_rpl_%';
+Variable_name	Value
+tokudb_rpl_check_readonly	ON
+tokudb_rpl_lookup_rows	OFF
+tokudb_rpl_lookup_rows_delay	10000
+tokudb_rpl_unique_checks	ON
+tokudb_rpl_unique_checks_delay	10000
 create table t (a bigint not null, b bigint not null, primary key(a)) engine=tokudb;
 insert into t values (1,0);
 insert into t values (2,0),(3,0);

mysql-test/suite/tokudb.rpl/r/rpl_tokudb_update_pk_uc1_lookup1.result

@@ -4,6 +4,13 @@ Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 drop table if exists t;
+show variables like 'tokudb_rpl_%';
+Variable_name	Value
+tokudb_rpl_check_readonly	ON
+tokudb_rpl_lookup_rows	ON
+tokudb_rpl_lookup_rows_delay	10000
+tokudb_rpl_unique_checks	ON
+tokudb_rpl_unique_checks_delay	10000
 create table t (a bigint not null, b bigint not null, primary key(a)) engine=tokudb;
 insert into t values (1,0);
 insert into t values (2,0),(3,0);

mysql-test/suite/tokudb.rpl/r/rpl_tokudb_update_unique_uc0_lookup0.result

@@ -4,6 +4,13 @@ Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 drop table if exists t;
+show variables like 'tokudb_rpl_%';
+Variable_name	Value
+tokudb_rpl_check_readonly	ON
+tokudb_rpl_lookup_rows	OFF
+tokudb_rpl_lookup_rows_delay	10000
+tokudb_rpl_unique_checks	OFF
+tokudb_rpl_unique_checks_delay	10000
 create table t (a bigint not null, b bigint not null, c bigint not null, primary key(a), unique key(c)) engine=tokudb;
 insert into t values (1,0,-1);
 insert into t values (2,0,-2),(3,0,-3);

mysql-test/suite/tokudb.rpl/r/rpl_tokudb_update_unique_uc0_lookup1.result

@@ -4,6 +4,13 @@ Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 drop table if exists t;
+show variables like 'tokudb_rpl_%';
+Variable_name	Value
+tokudb_rpl_check_readonly	ON
+tokudb_rpl_lookup_rows	ON
+tokudb_rpl_lookup_rows_delay	10000
+tokudb_rpl_unique_checks	OFF
+tokudb_rpl_unique_checks_delay	10000
 create table t (a bigint not null, b bigint not null, c bigint not null, primary key(a), unique key(c)) engine=tokudb;
 insert into t values (1,0,-1);
 insert into t values (2,0,-2),(3,0,-3);

mysql-test/suite/tokudb.rpl/r/rpl_tokudb_write_pk.result

@@ -4,6 +4,10 @@ Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 drop table if exists t;
+show variables like 'tokudb_rpl_unique_checks%';
+Variable_name	Value
+tokudb_rpl_unique_checks	OFF
+tokudb_rpl_unique_checks_delay	5000
 create table t (a bigint not null, primary key(a)) engine=tokudb;
 select unix_timestamp() into @tstart;
 insert into t values (1);

mysql-test/suite/tokudb.rpl/r/rpl_tokudb_write_pk_uc1.result

@@ -4,6 +4,10 @@ Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 drop table if exists t;
+show variables like 'tokudb_rpl_unique_checks%';
+Variable_name	Value
+tokudb_rpl_unique_checks	ON
+tokudb_rpl_unique_checks_delay	10000
 create table t (a bigint not null, primary key(a)) engine=tokudb;
 select unix_timestamp() into @tstart;
 insert into t values (1);

mysql-test/suite/tokudb.rpl/r/rpl_tokudb_write_unique.result

@@ -4,6 +4,10 @@ Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 drop table if exists t;
+show variables like 'tokudb_rpl_unique_checks%';
+Variable_name	Value
+tokudb_rpl_unique_checks	OFF
+tokudb_rpl_unique_checks_delay	5000
 create table t (a bigint not null, b bigint not null, primary key(a), unique key(b)) engine=tokudb;
 select unix_timestamp() into @tstart;
 insert into t values (1,2);

mysql-test/suite/tokudb.rpl/r/rpl_tokudb_write_unique_uc1.result

@@ -4,6 +4,10 @@ Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 drop table if exists t;
+show variables like 'tokudb_rpl_unique_checks%';
+Variable_name	Value
+tokudb_rpl_unique_checks	ON
+tokudb_rpl_unique_checks_delay	5000
 create table t (a bigint not null, b bigint not null, primary key(a), unique key(b)) engine=tokudb;
 select unix_timestamp() into @tstart;
 insert into t values (1,2);

mysql-test/suite/tokudb.rpl/t/rpl_parallel_tokudb.test

+--source include/have_tokudb.inc
 #Want to skip this test from daily Valgrind execution
 --source include/no_valgrind_without_big.inc
 #

mysql-test/suite/tokudb.rpl/t/rpl_parallel_tokudb_delete_pk-slave.opt

---read-only=ON --tokudb-rpl-unique-checks-delay=10000 --tokudb-rpl-unique-checks=OFF --tokudb-rpl-lookup-rows-delay=10000 --tokudb-rpl-lookup-rows=OFF --slave-parallel-workers=2
+--read-only=ON --loose-tokudb-rpl-unique-checks-delay=10000 --loose-tokudb-rpl-unique-checks=OFF --loose-tokudb-rpl-lookup-rows-delay=10000 --loose-tokudb-rpl-lookup-rows=OFF --slave-parallel-workers=2
 

mysql-test/suite/tokudb.rpl/t/rpl_parallel_tokudb_delete_pk.test

@@ -14,7 +14,7 @@ enable_warnings;
 
 connection slave;
 # show variables like 'read_only';
-# show variables like 'tokudb_rpl_%';
+show variables like 'tokudb_rpl_%';
 
 # insert some rows
 connection master;

mysql-test/suite/tokudb.rpl/t/rpl_parallel_tokudb_update_pk_uc0_lookup0-slave.opt

---read-only=ON --tokudb-rpl-unique-checks-delay=10000 --tokudb-rpl-unique-checks=OFF --tokudb-rpl-lookup-rows-delay=10000 --tokudb-rpl-lookup-rows=OFF --slave-parallel-workers=2
+--read-only=ON --loose-tokudb-rpl-unique-checks-delay=10000 --loose-tokudb-rpl-unique-checks=OFF --loose-tokudb-rpl-lookup-rows-delay=10000 --loose-tokudb-rpl-lookup-rows=OFF --slave-parallel-workers=2

mysql-test/suite/tokudb.rpl/t/rpl_parallel_tokudb_update_pk_uc0_lookup0.test

@@ -13,7 +13,7 @@ enable_warnings;
 
 connection slave;
 # show variables like 'read_only';
-# show variables like 'tokudb_rpl_%';
+show variables like 'tokudb_rpl_%';
 
 # insert some rows
 connection master;

mysql-test/suite/tokudb.rpl/t/rpl_parallel_tokudb_write_pk-slave.opt

---read-only=ON --tokudb-rpl-unique-checks-delay=5000 --tokudb-rpl-unique-checks=OFF --slave-parallel-workers=2
+--read-only=ON --loose-tokudb-rpl-unique-checks-delay=5000 --loose-tokudb-rpl-unique-checks=OFF --slave-parallel-workers=2
 

mysql-test/suite/tokudb.rpl/t/rpl_parallel_tokudb_write_pk.test

@@ -14,7 +14,7 @@ enable_warnings;
 
 connection slave;
 # show variables like 'read_only';
-# show variables like 'tokudb_rpl_unique_checks%';
+show variables like 'tokudb_rpl_unique_checks%';
 
 # insert some rows
 connection master;

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_delete_pk-slave.opt

---read-only=ON --tokudb-rpl-unique-checks-delay=10000 --tokudb-rpl-unique-checks=OFF --tokudb-rpl-lookup-rows-delay=10000 --tokudb-rpl-lookup-rows=OFF
+--read-only=ON --loose-tokudb-rpl-unique-checks-delay=10000 --loose-tokudb-rpl-unique-checks=OFF --loose-tokudb-rpl-lookup-rows-delay=10000 --loose-tokudb-rpl-lookup-rows=OFF

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_delete_pk.test

@@ -14,7 +14,7 @@ enable_warnings;
 
 connection slave;
 # show variables like 'read_only';
-# show variables like 'tokudb_rpl_%';
+show variables like 'tokudb_rpl_%';
 
 # insert some rows
 connection master;

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_delete_pk_lookup1-slave.opt

---read-only=ON --tokudb-rpl-unique-checks-delay=0 --tokudb-rpl-unique-checks=ON --tokudb-rpl-lookup-rows-delay=10000 --tokudb-rpl-lookup-rows=ON
+--read-only=ON --loose-tokudb-rpl-unique-checks-delay=0 --loose-tokudb-rpl-unique-checks=ON --loose-tokudb-rpl-lookup-rows-delay=10000 --loose-tokudb-rpl-lookup-rows=ON

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_delete_pk_lookup1.test

@@ -15,7 +15,7 @@ enable_warnings;
 
 connection slave;
 # show variables like 'read_only';
-# show variables like 'tokudb_rpl_%';
+show variables like 'tokudb_rpl_%';
 
 # insert some rows
 connection master;

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_mixed_dml-master.opt

---tokudb_pk_insert_mode=2
-

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_mixed_dml.test

@@ -6,4 +6,7 @@
 --source include/have_binlog_format_mixed.inc
 --source include/have_tokudb.inc
 let $engine_type=TokuDB;
+
+SET SESSION tokudb_pk_insert_mode = 2;
+
 --source suite/rpl/include/rpl_mixed_dml.inc

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_read_only_ff-slave.opt

---read-only=OFF --tokudb-rpl-check-readonly=OFF --tokudb-rpl-unique-checks-delay=5000 --tokudb-rpl-unique-checks=OFF
+--read-only=OFF --loose-tokudb-rpl-check-readonly=OFF --loose-tokudb-rpl-unique-checks-delay=5000 --loose-tokudb-rpl-unique-checks=OFF

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_read_only_ff.test

@@ -14,7 +14,7 @@ enable_warnings;
 
 connection slave;
 # show variables like 'read_only';
-# show variables like 'tokudb_rpl_unique_checks%';
+show variables like 'tokudb_rpl%';
 
 # insert some rows
 connection master;

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_read_only_ft-slave.opt

---read-only=OFF --tokudb-rpl-check-readonly=ON --tokudb-rpl-unique-checks-delay=5000 --tokudb-rpl-unique-checks=OFF
+--read-only=OFF --loose-tokudb-rpl-check-readonly=ON --loose-tokudb-rpl-unique-checks-delay=5000 --loose-tokudb-rpl-unique-checks=OFF

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_read_only_ft.test

@@ -14,7 +14,7 @@ enable_warnings;
 
 connection slave;
 # show variables like 'read_only';
-# show variables like 'tokudb_rpl_unique_checks%';
+show variables like 'tokudb_rpl%';
 
 # insert some rows
 connection master;

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_read_only_tf-slave.opt

---read-only=ON --tokudb-rpl-check-readonly=OFF --tokudb-rpl-unique-checks-delay=5000 --tokudb-rpl-unique-checks=OFF
+--read-only=ON --loose-tokudb-rpl-check-readonly=OFF --loose-tokudb-rpl-unique-checks-delay=5000 --loose-tokudb-rpl-unique-checks=OFF

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_read_only_tf.test

@@ -14,7 +14,7 @@ enable_warnings;
 
 connection slave;
 # show variables like 'read_only';
-# show variables like 'tokudb_rpl_unique_checks%';
+show variables like 'tokudb_rpl%';
 
 # insert some rows
 connection master;

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_read_only_tt-slave.opt

---read-only=ON --tokudb-rpl-check-readonly=ON --tokudb-rpl-unique-checks-delay=5000 --tokudb-rpl-unique-checks=OFF
+--read-only=ON --loose-tokudb-rpl-check-readonly=ON --loose-tokudb-rpl-unique-checks-delay=5000 --loose-tokudb-rpl-unique-checks=OFF

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_read_only_tt.test

@@ -14,7 +14,7 @@ enable_warnings;
 
 connection slave;
 # show variables like 'read_only';
-# show variables like 'tokudb_rpl_unique_checks%';
+show variables like 'tokudb_rpl%';
 
 # insert some rows
 connection master;

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_pk_uc0_lookup0-slave.opt

---read-only=ON --tokudb-rpl-unique-checks-delay=10000 --tokudb-rpl-unique-checks=OFF --tokudb-rpl-lookup-rows-delay=10000 --tokudb-rpl-lookup-rows=OFF
+--read-only=ON --loose-tokudb-rpl-unique-checks-delay=10000 --loose-tokudb-rpl-unique-checks=OFF --loose-tokudb-rpl-lookup-rows-delay=10000 --loose-tokudb-rpl-lookup-rows=OFF

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_pk_uc0_lookup0.test

@@ -13,7 +13,7 @@ enable_warnings;
 
 connection slave;
 # show variables like 'read_only';
-# show variables like 'tokudb_rpl_%';
+show variables like 'tokudb_rpl_%';
 
 # insert some rows
 connection master;

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_pk_uc0_lookup1-slave.opt

---read-only=ON --tokudb-rpl-unique-checks-delay=10000 --tokudb-rpl-unique-checks=OFF --tokudb-rpl-lookup-rows-delay=10000 --tokudb-rpl-lookup-rows=ON
+--read-only=ON --loose-tokudb-rpl-unique-checks-delay=10000 --loose-tokudb-rpl-unique-checks=OFF --loose-tokudb-rpl-lookup-rows-delay=10000 --loose-tokudb-rpl-lookup-rows=ON

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_pk_uc0_lookup1.test

@@ -13,7 +13,7 @@ enable_warnings;
 
 connection slave;
 # show variables like 'read_only';
-# show variables like 'tokudb_rpl_%';
+show variables like 'tokudb_rpl_%';
 
 # insert some rows
 connection master;

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_pk_uc1_lookup0-slave.opt

---read-only=ON --tokudb-rpl-unique-checks-delay=10000 --tokudb-rpl-unique-checks=ON --tokudb-rpl-lookup-rows-delay=10000 --tokudb-rpl-lookup-rows=OFF
+--read-only=ON --loose-tokudb-rpl-unique-checks-delay=10000 --loose-tokudb-rpl-unique-checks=ON --loose-tokudb-rpl-lookup-rows-delay=10000 --loose-tokudb-rpl-lookup-rows=OFF

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_pk_uc1_lookup0.test

@@ -13,7 +13,7 @@ enable_warnings;
 
 connection slave;
 # show variables like 'read_only';
-# show variables like 'tokudb_rpl_%';
+show variables like 'tokudb_rpl_%';
 
 # insert some rows
 connection master;

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_pk_uc1_lookup1-slave.opt

---read-only=ON --tokudb-rpl-unique-checks-delay=10000 --tokudb-rpl-unique-checks=ON --tokudb-rpl-lookup-rows-delay=10000 --tokudb-rpl-lookup-rows=ON
+--read-only=ON --loose-tokudb-rpl-unique-checks-delay=10000 --loose-tokudb-rpl-unique-checks=ON --loose-tokudb-rpl-lookup-rows-delay=10000 --loose-tokudb-rpl-lookup-rows=ON

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_pk_uc1_lookup1.test

@@ -13,7 +13,7 @@ enable_warnings;
 
 connection slave;
 # show variables like 'read_only';
-# show variables like 'tokudb_rpl_%';
+show variables like 'tokudb_rpl_%';
 
 # insert some rows
 connection master;

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_unique_uc0_lookup0-slave.opt

---read-only=ON --tokudb-rpl-unique-checks-delay=10000 --tokudb-rpl-unique-checks=OFF --tokudb-rpl-lookup-rows-delay=10000 --tokudb-rpl-lookup-rows=OFF
+--read-only=ON --loose-tokudb-rpl-unique-checks-delay=10000 --loose-tokudb-rpl-unique-checks=OFF --loose-tokudb-rpl-lookup-rows-delay=10000 --loose-tokudb-rpl-lookup-rows=OFF

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_unique_uc0_lookup0.test

@@ -13,7 +13,7 @@ enable_warnings;
 
 connection slave;
 # show variables like 'read_only';
-# show variables like 'tokudb_rpl_%';
+show variables like 'tokudb_rpl_%';
 
 # insert some rows
 connection master;

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_unique_uc0_lookup1-slave.opt

---read-only=ON --tokudb-rpl-unique-checks-delay=10000 --tokudb-rpl-unique-checks=OFF --tokudb-rpl-lookup-rows-delay=10000 --tokudb-rpl-lookup-rows=ON
+--read-only=ON --loose-tokudb-rpl-unique-checks-delay=10000 --loose-tokudb-rpl-unique-checks=OFF --loose-tokudb-rpl-lookup-rows-delay=10000 --loose-tokudb-rpl-lookup-rows=ON

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_update_unique_uc0_lookup1.test

@@ -13,7 +13,7 @@ enable_warnings;
 
 connection slave;
 # show variables like 'read_only';
-# show variables like 'tokudb_rpl_%';
+show variables like 'tokudb_rpl_%';
 
 # insert some rows
 connection master;

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_write_pk-slave.opt

---read-only=ON --tokudb-rpl-unique-checks-delay=5000 --tokudb-rpl-unique-checks=OFF
+--read-only=ON --loose-tokudb-rpl-unique-checks-delay=5000 --loose-tokudb-rpl-unique-checks=OFF

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_write_pk.test

@@ -14,7 +14,7 @@ enable_warnings;
 
 connection slave;
 # show variables like 'read_only';
-# show variables like 'tokudb_rpl_unique_checks%';
+show variables like 'tokudb_rpl_unique_checks%';
 
 # insert some rows
 connection master;

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_write_pk_uc1-slave.opt

---read-only=ON --tokudb-rpl-unique-checks-delay=10000 --tokudb-rpl-unique-checks=ON
+--read-only=ON --loose-tokudb-rpl-unique-checks-delay=10000 --loose-tokudb-rpl-unique-checks=ON

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_write_pk_uc1.test

@@ -14,7 +14,7 @@ enable_warnings;
 
 connection slave;
 # show variables like 'read_only';
-# show variables like 'tokudb_rpl_unique_checks%';
+show variables like 'tokudb_rpl_unique_checks%';
 
 # insert some rows
 connection master;

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_write_unique-slave.opt

---read-only=ON --tokudb-rpl-unique-checks-delay=5000 --tokudb-rpl-unique-checks=OFF
+--read-only=ON --loose-tokudb-rpl-unique-checks-delay=5000 --loose-tokudb-rpl-unique-checks=OFF

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_write_unique.test

@@ -14,7 +14,7 @@ enable_warnings;
 
 connection slave;
 # show variables like 'read_only';
-# show variables like 'tokudb_rpl_unique_checks%';
+show variables like 'tokudb_rpl_unique_checks%';
 
 # insert some rows
 connection master;

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_write_unique_uc1-slave.opt

---read-only=ON --tokudb-rpl-unique-checks-delay=5000 --tokudb-rpl-unique-checks=ON
+--read-only=ON --loose-tokudb-rpl-unique-checks-delay=5000 --loose-tokudb-rpl-unique-checks=ON

mysql-test/suite/tokudb.rpl/t/rpl_tokudb_write_unique_uc1.test

@@ -14,7 +14,7 @@ enable_warnings;
 
 connection slave;
 # show variables like 'read_only';
-# show variables like 'tokudb_rpl_unique_checks%';
+show variables like 'tokudb_rpl_unique_checks%';
 
 # insert some rows
 connection master;

mysql-test/suite/tokudb.rpl/t/suite.opt

+$TOKUDB_OPT $TOKUDB_LOAD_ADD --loose-tokudb-check-jemalloc=0

mysql-test/suite/tokudb.sys_vars/r/tokudb_analyze_delete_fraction.result

+SET @orig_global = @@global.tokudb_analyze_delete_fraction;
+SELECT @orig_global;
+@orig_global
+1
+SET @orig_session = @@session.tokudb_analyze_delete_fraction;
+SELECT @orig_session;
+@orig_session
+1
+SET GLOBAL tokudb_analyze_delete_fraction = .5;
+SELECT @@global.tokudb_analyze_delete_fraction;
+@@global.tokudb_analyze_delete_fraction
+0.500000
+SET GLOBAL tokudb_analyze_delete_fraction = 0;
+SELECT @@global.tokudb_analyze_delete_fraction;
+@@global.tokudb_analyze_delete_fraction
+0.000000
+SET GLOBAL tokudb_analyze_delete_fraction = DEFAULT;
+SELECT @@global.tokudb_analyze_delete_fraction;
+@@global.tokudb_analyze_delete_fraction
+1.000000
+SET GLOBAL tokudb_analyze_delete_fraction = 'foobar';
+ERROR 42000: Incorrect argument type to variable 'tokudb_analyze_delete_fraction'
+SELECT @@global.tokudb_analyze_delete_fraction;
+@@global.tokudb_analyze_delete_fraction
+1.000000
+SET GLOBAL tokudb_analyze_delete_fraction = 3.75;
+Warnings:
+Warning	1292	Truncated incorrect tokudb_analyze_delete_fraction value: '3.75'
+SELECT @@global.tokudb_analyze_delete_fraction;
+@@global.tokudb_analyze_delete_fraction
+1.000000
+SET SESSION tokudb_analyze_delete_fraction = .5;
+SELECT @@session.tokudb_analyze_delete_fraction;
+@@session.tokudb_analyze_delete_fraction
+0.500000
+SET SESSION tokudb_analyze_delete_fraction = 0;
+SELECT @@session.tokudb_analyze_delete_fraction;
+@@session.tokudb_analyze_delete_fraction
+0.000000
+SET SESSION tokudb_analyze_delete_fraction = DEFAULT;
+SELECT @@session.tokudb_analyze_delete_fraction;
+@@session.tokudb_analyze_delete_fraction
+1.000000
+SET SESSION tokudb_analyze_delete_fraction = 'foobar';
+ERROR 42000: Incorrect argument type to variable 'tokudb_analyze_delete_fraction'
+SELECT @@session.tokudb_analyze_delete_fraction;
+@@session.tokudb_analyze_delete_fraction
+1.000000
+SET SESSION tokudb_analyze_delete_fraction = 3.75;
+Warnings:
+Warning	1292	Truncated incorrect tokudb_analyze_delete_fraction value: '3.75'
+SELECT @@session.tokudb_analyze_delete_fraction;
+@@session.tokudb_analyze_delete_fraction
+1.000000
+SET GLOBAL tokudb_analyze_delete_fraction = .2;
+SET SESSION tokudb_analyze_delete_fraction = .3;
+SELECT @@global.tokudb_analyze_delete_fraction;
+@@global.tokudb_analyze_delete_fraction
+0.200000
+SELECT @@session.tokudb_analyze_delete_fraction;
+@@session.tokudb_analyze_delete_fraction
+0.300000
+SHOW VARIABLES LIKE 'tokudb_analyze_delete_fraction';
+Variable_name	Value
+tokudb_analyze_delete_fraction	0.300000
+SET SESSION tokudb_analyze_delete_fraction = @orig_session;
+SELECT @@session.tokudb_analyze_delete_fraction;
+@@session.tokudb_analyze_delete_fraction
+1.000000
+SET GLOBAL tokudb_analyze_delete_fraction = @orig_global;
+SELECT @@global.tokudb_analyze_delete_fraction;
+@@global.tokudb_analyze_delete_fraction
+1.000000

mysql-test/suite/tokudb.sys_vars/r/tokudb_analyze_in_background_basic.result

+SET @orig_global = @@global.tokudb_analyze_in_background;
+SELECT @orig_global;
+@orig_global
+0
+SET @orig_session = @@session.tokudb_analyze_in_background;
+SELECT @orig_session;
+@orig_session
+0
+SET GLOBAL tokudb_analyze_in_background = 0;
+SELECT @@global.tokudb_analyze_in_background;
+@@global.tokudb_analyze_in_background
+0
+SET GLOBAL tokudb_analyze_in_background = 1;
+SELECT @@global.tokudb_analyze_in_background;
+@@global.tokudb_analyze_in_background
+1
+SET GLOBAL tokudb_analyze_in_background = DEFAULT;
+SELECT @@global.tokudb_analyze_in_background;
+@@global.tokudb_analyze_in_background
+0
+SET GLOBAL tokudb_analyze_in_background = -6;
+SELECT @@global.tokudb_analyze_in_background;
+@@global.tokudb_analyze_in_background
+1
+SET GLOBAL tokudb_analyze_in_background = 1.6;
+ERROR 42000: Incorrect argument type to variable 'tokudb_analyze_in_background'
+SELECT @@global.tokudb_analyze_in_background;
+@@global.tokudb_analyze_in_background
+1
+SET GLOBAL tokudb_analyze_in_background = "T";
+ERROR 42000: Variable 'tokudb_analyze_in_background' can't be set to the value of 'T'
+SELECT @@global.tokudb_analyze_in_background;
+@@global.tokudb_analyze_in_background
+1
+SET GLOBAL tokudb_analyze_in_background = "Y";
+ERROR 42000: Variable 'tokudb_analyze_in_background' can't be set to the value of 'Y'
+SELECT @@global.tokudb_analyze_in_background;
+@@global.tokudb_analyze_in_background
+1
+SET GLOBAL tokudb_analyze_in_background = 'foobar';
+ERROR 42000: Variable 'tokudb_analyze_in_background' can't be set to the value of 'foobar'
+SELECT @@global.tokudb_analyze_in_background;
+@@global.tokudb_analyze_in_background
+1
+SET SESSION tokudb_analyze_in_background = 0;
+SELECT @@session.tokudb_analyze_in_background;
+@@session.tokudb_analyze_in_background
+0
+SET SESSION tokudb_analyze_in_background = 1;
+SELECT @@session.tokudb_analyze_in_background;
+@@session.tokudb_analyze_in_background
+1
+SET SESSION tokudb_analyze_in_background = DEFAULT;
+SELECT @@session.tokudb_analyze_in_background;
+@@session.tokudb_analyze_in_background
+1
+SET SESSION tokudb_analyze_in_background = -6;
+SELECT @@session.tokudb_analyze_in_background;
+@@session.tokudb_analyze_in_background
+1
+SET SESSION tokudb_analyze_in_background = 1.6;
+ERROR 42000: Incorrect argument type to variable 'tokudb_analyze_in_background'
+SELECT @@session.tokudb_analyze_in_background;
+@@session.tokudb_analyze_in_background
+1
+SET SESSION tokudb_analyze_in_background = "T";
+ERROR 42000: Variable 'tokudb_analyze_in_background' can't be set to the value of 'T'
+SELECT @@session.tokudb_analyze_in_background;
+@@session.tokudb_analyze_in_background
+1
+SET SESSION tokudb_analyze_in_background = "Y";
+ERROR 42000: Variable 'tokudb_analyze_in_background' can't be set to the value of 'Y'
+SELECT @@session.tokudb_analyze_in_background;
+@@session.tokudb_analyze_in_background
+1
+SET SESSION tokudb_analyze_in_background = 'foobar';
+ERROR 42000: Variable 'tokudb_analyze_in_background' can't be set to the value of 'foobar'
+SELECT @@session.tokudb_analyze_in_background;
+@@session.tokudb_analyze_in_background
+1
+SET GLOBAL tokudb_analyze_in_background = 0;
+SET SESSION tokudb_analyze_in_background = 1;
+SELECT @@global.tokudb_analyze_in_background;
+@@global.tokudb_analyze_in_background
+0
+SELECT @@session.tokudb_analyze_in_background;
+@@session.tokudb_analyze_in_background
+1
+SHOW VARIABLES LIKE 'tokudb_analyze_in_background';
+Variable_name	Value
+tokudb_analyze_in_background	ON
+SET SESSION tokudb_analyze_in_background = @orig_session;
+SELECT @@session.tokudb_analyze_in_background;
+@@session.tokudb_analyze_in_background
+0
+SET GLOBAL tokudb_analyze_in_background = @orig_global;
+SELECT @@global.tokudb_analyze_in_background;
+@@global.tokudb_analyze_in_background
+0

mysql-test/suite/tokudb.sys_vars/r/tokudb_analyze_mode_basic.result

+SET @orig_global = @@global.tokudb_analyze_mode;
+SELECT @orig_global;
+@orig_global
+TOKUDB_ANALYZE_STANDARD
+SET @orig_session = @@session.tokudb_analyze_mode;
+SELECT @orig_session;
+@orig_session
+TOKUDB_ANALYZE_STANDARD
+SET GLOBAL tokudb_analyze_mode = 'tokudb_analyze_standard';
+SELECT @@global.tokudb_analyze_mode;
+@@global.tokudb_analyze_mode
+TOKUDB_ANALYZE_STANDARD
+SET GLOBAL tokudb_analyze_mode = 'tokudb_analyze_recount_rows';
+SELECT @@global.tokudb_analyze_mode;
+@@global.tokudb_analyze_mode
+TOKUDB_ANALYZE_RECOUNT_ROWS
+SET GLOBAL tokudb_analyze_mode = 'tokudb_analyze_cancel';
+SELECT @@global.tokudb_analyze_mode;
+@@global.tokudb_analyze_mode
+TOKUDB_ANALYZE_CANCEL
+SET GLOBAL tokudb_analyze_mode = DEFAULT;
+SELECT @@global.tokudb_analyze_mode;
+@@global.tokudb_analyze_mode
+TOKUDB_ANALYZE_STANDARD
+SET GLOBAL tokudb_analyze_mode = '';
+ERROR 42000: Variable 'tokudb_analyze_mode' can't be set to the value of ''
+SELECT @@global.tokudb_analyze_mode;
+@@global.tokudb_analyze_mode
+TOKUDB_ANALYZE_STANDARD
+SET GLOBAL tokudb_analyze_mode = 'foobar';
+ERROR 42000: Variable 'tokudb_analyze_mode' can't be set to the value of 'foobar'
+SELECT @@global.tokudb_analyze_mode;
+@@global.tokudb_analyze_mode
+TOKUDB_ANALYZE_STANDARD
+SET GLOBAL tokudb_analyze_mode = 123;
+ERROR 42000: Variable 'tokudb_analyze_mode' can't be set to the value of '123'
+SELECT @@global.tokudb_analyze_mode;
+@@global.tokudb_analyze_mode
+TOKUDB_ANALYZE_STANDARD
+SET SESSION tokudb_analyze_mode = 'tokudb_analyze_standard';
+SELECT @@session.tokudb_analyze_mode;
+@@session.tokudb_analyze_mode
+TOKUDB_ANALYZE_STANDARD
+SET SESSION tokudb_analyze_mode = 'tokudb_analyze_recount_rows';
+SELECT @@session.tokudb_analyze_mode;
+@@session.tokudb_analyze_mode
+TOKUDB_ANALYZE_RECOUNT_ROWS
+SET SESSION tokudb_analyze_mode = 'tokudb_analyze_cancel';
+SELECT @@session.tokudb_analyze_mode;
+@@session.tokudb_analyze_mode
+TOKUDB_ANALYZE_CANCEL
+SET SESSION tokudb_analyze_mode = DEFAULT;
+SELECT @@session.tokudb_analyze_mode;
+@@session.tokudb_analyze_mode
+TOKUDB_ANALYZE_STANDARD
+SET SESSION tokudb_analyze_mode = '';
+ERROR 42000: Variable 'tokudb_analyze_mode' can't be set to the value of ''
+SELECT @@session.tokudb_analyze_mode;
+@@session.tokudb_analyze_mode
+TOKUDB_ANALYZE_STANDARD
+SET SESSION tokudb_analyze_mode = 'foobar';
+ERROR 42000: Variable 'tokudb_analyze_mode' can't be set to the value of 'foobar'
+SELECT @@session.tokudb_analyze_mode;
+@@session.tokudb_analyze_mode
+TOKUDB_ANALYZE_STANDARD
+SET SESSION tokudb_analyze_mode = 123;
+ERROR 42000: Variable 'tokudb_analyze_mode' can't be set to the value of '123'
+SELECT @@session.tokudb_analyze_mode;
+@@session.tokudb_analyze_mode
+TOKUDB_ANALYZE_STANDARD
+SET GLOBAL tokudb_analyze_mode = 'tokudb_analyze_standard';
+SET SESSION tokudb_analyze_mode = 'tokudb_analyze_recount_rows';
+SELECT @@global.tokudb_analyze_mode;
+@@global.tokudb_analyze_mode
+TOKUDB_ANALYZE_STANDARD
+SELECT @@session.tokudb_analyze_mode;
+@@session.tokudb_analyze_mode
+TOKUDB_ANALYZE_RECOUNT_ROWS
+SHOW VARIABLES LIKE 'tokudb_analyze_mode';
+Variable_name	Value
+tokudb_analyze_mode	TOKUDB_ANALYZE_RECOUNT_ROWS
+SET SESSION tokudb_analyze_mode = @orig_session;
+SELECT @@session.tokudb_analyze_mode;
+@@session.tokudb_analyze_mode
+TOKUDB_ANALYZE_STANDARD
+SET GLOBAL tokudb_analyze_mode = @orig_global;
+SELECT @@global.tokudb_analyze_mode;
+@@global.tokudb_analyze_mode
+TOKUDB_ANALYZE_STANDARD

mysql-test/suite/tokudb.sys_vars/r/tokudb_analyze_throttle_basic.result

+SET @orig_global = @@global.tokudb_analyze_throttle;
+SELECT @orig_global;
+@orig_global
+0
+SET @orig_session = @@session.tokudb_analyze_throttle;
+SELECT @orig_session;
+@orig_session
+0
+SET GLOBAL tokudb_analyze_throttle = 10;
+SELECT @@global.tokudb_analyze_throttle;
+@@global.tokudb_analyze_throttle
+10
+SET GLOBAL tokudb_analyze_throttle = 0;
+SELECT @@global.tokudb_analyze_throttle;
+@@global.tokudb_analyze_throttle
+0
+SET GLOBAL tokudb_analyze_throttle = DEFAULT;
+SELECT @@global.tokudb_analyze_throttle;
+@@global.tokudb_analyze_throttle
+0
+SET GLOBAL tokudb_analyze_throttle = 'foobar';
+ERROR 42000: Incorrect argument type to variable 'tokudb_analyze_throttle'
+SELECT @@global.tokudb_analyze_throttle;
+@@global.tokudb_analyze_throttle
+0
+SET SESSION tokudb_analyze_throttle = 10;
+SELECT @@session.tokudb_analyze_throttle;
+@@session.tokudb_analyze_throttle
+10
+SET SESSION tokudb_analyze_throttle = 0;
+SELECT @@session.tokudb_analyze_throttle;
+@@session.tokudb_analyze_throttle
+0
+SET SESSION tokudb_analyze_throttle = DEFAULT;
+SELECT @@session.tokudb_analyze_throttle;
+@@session.tokudb_analyze_throttle
+0
+SET SESSION tokudb_analyze_throttle = 'foobar';
+ERROR 42000: Incorrect argument type to variable 'tokudb_analyze_throttle'
+SELECT @@session.tokudb_analyze_throttle;
+@@session.tokudb_analyze_throttle
+0
+SET GLOBAL tokudb_analyze_throttle = 12;
+SET SESSION tokudb_analyze_throttle = 13;
+SELECT @@global.tokudb_analyze_throttle;
+@@global.tokudb_analyze_throttle
+12
+SELECT @@session.tokudb_analyze_throttle;
+@@session.tokudb_analyze_throttle
+13
+SHOW VARIABLES LIKE 'tokudb_analyze_throttle';
+Variable_name	Value
+tokudb_analyze_throttle	13
+SET SESSION tokudb_analyze_throttle = @orig_session;
+SELECT @@session.tokudb_analyze_throttle;
+@@session.tokudb_analyze_throttle
+0
+SET GLOBAL tokudb_analyze_throttle = @orig_global;
+SELECT @@global.tokudb_analyze_throttle;
+@@global.tokudb_analyze_throttle
+0

mysql-test/suite/tokudb.sys_vars/r/tokudb_analyze_time_basic.result

+SET @orig_global = @@global.tokudb_analyze_time;
+SELECT @orig_global;
+@orig_global
+5
+SET @orig_session = @@session.tokudb_analyze_time;
+SELECT @orig_session;
+@orig_session
+5
+SET GLOBAL tokudb_analyze_time = 10;
+SELECT @@global.tokudb_analyze_time;
+@@global.tokudb_analyze_time
+10
+SET GLOBAL tokudb_analyze_time = 0;
+SELECT @@global.tokudb_analyze_time;
+@@global.tokudb_analyze_time
+0
+SET GLOBAL tokudb_analyze_time = DEFAULT;
+SELECT @@global.tokudb_analyze_time;
+@@global.tokudb_analyze_time
+5
+SET GLOBAL tokudb_analyze_time = 'foobar';
+ERROR 42000: Incorrect argument type to variable 'tokudb_analyze_time'
+SELECT @@global.tokudb_analyze_time;
+@@global.tokudb_analyze_time
+5
+SET SESSION tokudb_analyze_time = 10;
+SELECT @@session.tokudb_analyze_time;
+@@session.tokudb_analyze_time
+10
+SET SESSION tokudb_analyze_time = 0;
+SELECT @@session.tokudb_analyze_time;
+@@session.tokudb_analyze_time
+0
+SET SESSION tokudb_analyze_time = DEFAULT;
+SELECT @@session.tokudb_analyze_time;
+@@session.tokudb_analyze_time
+5
+SET SESSION tokudb_analyze_time = 'foobar';
+ERROR 42000: Incorrect argument type to variable 'tokudb_analyze_time'
+SELECT @@session.tokudb_analyze_time;
+@@session.tokudb_analyze_time
+5
+SET GLOBAL tokudb_analyze_time = 12;
+SET SESSION tokudb_analyze_time = 13;
+SELECT @@global.tokudb_analyze_time;
+@@global.tokudb_analyze_time
+12
+SELECT @@session.tokudb_analyze_time;
+@@session.tokudb_analyze_time
+13
+SHOW VARIABLES LIKE 'tokudb_analyze_time';
+Variable_name	Value
+tokudb_analyze_time	13
+SET SESSION tokudb_analyze_time = @orig_session;
+SELECT @@session.tokudb_analyze_time;
+@@session.tokudb_analyze_time
+5
+SET GLOBAL tokudb_analyze_time = @orig_global;
+SELECT @@global.tokudb_analyze_time;
+@@global.tokudb_analyze_time
+5

mysql-test/suite/tokudb.sys_vars/r/tokudb_auto_analyze.result

+SET @orig_global = @@global.tokudb_auto_analyze;
+SELECT @orig_global;
+@orig_global
+0
+SET @orig_session = @@session.tokudb_auto_analyze;
+SELECT @orig_session;
+@orig_session
+0
+SET GLOBAL tokudb_auto_analyze = 10;
+SELECT @@global.tokudb_auto_analyze;
+@@global.tokudb_auto_analyze
+10
+SET GLOBAL tokudb_auto_analyze = 0;
+SELECT @@global.tokudb_auto_analyze;
+@@global.tokudb_auto_analyze
+0
+SET GLOBAL tokudb_auto_analyze = DEFAULT;
+SELECT @@global.tokudb_auto_analyze;
+@@global.tokudb_auto_analyze
+0
+SET GLOBAL tokudb_auto_analyze = 'foobar';
+ERROR 42000: Incorrect argument type to variable 'tokudb_auto_analyze'
+SELECT @@global.tokudb_auto_analyze;
+@@global.tokudb_auto_analyze
+0
+SET SESSION tokudb_auto_analyze = 10;
+SELECT @@session.tokudb_auto_analyze;
+@@session.tokudb_auto_analyze
+10
+SET SESSION tokudb_auto_analyze = 0;
+SELECT @@session.tokudb_auto_analyze;
+@@session.tokudb_auto_analyze
+0
+SET SESSION tokudb_auto_analyze = DEFAULT;
+SELECT @@session.tokudb_auto_analyze;
+@@session.tokudb_auto_analyze
+0
+SET SESSION tokudb_auto_analyze = 'foobar';
+ERROR 42000: Incorrect argument type to variable 'tokudb_auto_analyze'
+SELECT @@session.tokudb_auto_analyze;
+@@session.tokudb_auto_analyze
+0
+SET GLOBAL tokudb_auto_analyze = 12;
+SET SESSION tokudb_auto_analyze = 13;
+SELECT @@global.tokudb_auto_analyze;
+@@global.tokudb_auto_analyze
+12
+SELECT @@session.tokudb_auto_analyze;
+@@session.tokudb_auto_analyze
+13
+SHOW VARIABLES LIKE 'tokudb_auto_analyze';
+Variable_name	Value
+tokudb_auto_analyze	13
+SET SESSION tokudb_auto_analyze = @orig_session;
+SELECT @@session.tokudb_auto_analyze;
+@@session.tokudb_auto_analyze
+0
+SET GLOBAL tokudb_auto_analyze = @orig_global;
+SELECT @@global.tokudb_auto_analyze;
+@@global.tokudb_auto_analyze
+0

mysql-test/suite/tokudb.sys_vars/r/tokudb_cardinality_scale_percent_basic.result

+SET @orig_global = @@global.tokudb_cardinality_scale_percent;
+SELECT @orig_global;
+@orig_global
+50
+SET GLOBAL tokudb_cardinality_scale_percent = 10;
+SELECT @@global.tokudb_cardinality_scale_percent;
+@@global.tokudb_cardinality_scale_percent
+10
+SET GLOBAL tokudb_cardinality_scale_percent = 0;
+SELECT @@global.tokudb_cardinality_scale_percent;
+@@global.tokudb_cardinality_scale_percent
+0
+SET GLOBAL tokudb_cardinality_scale_percent = DEFAULT;
+SELECT @@global.tokudb_cardinality_scale_percent;
+@@global.tokudb_cardinality_scale_percent
+50
+SET GLOBAL tokudb_cardinality_scale_percent = 'foobar';
+ERROR 42000: Incorrect argument type to variable 'tokudb_cardinality_scale_percent'
+SELECT @@global.tokudb_cardinality_scale_percent;
+@@global.tokudb_cardinality_scale_percent
+50
+SET GLOBAL tokudb_cardinality_scale_percent = 12;
+SET SESSION tokudb_cardinality_scale_percent = 13;
+ERROR HY000: Variable 'tokudb_cardinality_scale_percent' is a GLOBAL variable and should be set with SET GLOBAL
+SELECT @@global.tokudb_cardinality_scale_percent;
+@@global.tokudb_cardinality_scale_percent
+12
+SELECT @@session.tokudb_cardinality_scale_percent;
+ERROR HY000: Variable 'tokudb_cardinality_scale_percent' is a GLOBAL variable
+SHOW VARIABLES LIKE 'tokudb_cardinality_scale_percent';
+Variable_name	Value
+tokudb_cardinality_scale_percent	12
+SET GLOBAL tokudb_cardinality_scale_percent = @orig_global;
+SELECT @@global.tokudb_cardinality_scale_percent;
+@@global.tokudb_cardinality_scale_percent
+50

mysql-test/suite/tokudb.sys_vars/t/suite.opt

+$TOKUDB_OPT $TOKUDB_LOAD_ADD --loose-tokudb-check-jemalloc=0

mysql-test/suite/tokudb.sys_vars/t/tokudb_analyze_delete_fraction.test

+--source include/have_tokudb.inc
+
+# Check the default value
+SET @orig_global = @@global.tokudb_analyze_delete_fraction;
+SELECT @orig_global;
+
+SET @orig_session = @@session.tokudb_analyze_delete_fraction;
+SELECT @orig_session;
+
+# Test global
+SET GLOBAL tokudb_analyze_delete_fraction = .5;
+SELECT @@global.tokudb_analyze_delete_fraction;
+
+SET GLOBAL tokudb_analyze_delete_fraction = 0;
+SELECT @@global.tokudb_analyze_delete_fraction;
+
+SET GLOBAL tokudb_analyze_delete_fraction = DEFAULT;
+SELECT @@global.tokudb_analyze_delete_fraction;
+
+-- error ER_WRONG_TYPE_FOR_VAR
+SET GLOBAL tokudb_analyze_delete_fraction = 'foobar';
+SELECT @@global.tokudb_analyze_delete_fraction;
+
+SET GLOBAL tokudb_analyze_delete_fraction = 3.75;
+SELECT @@global.tokudb_analyze_delete_fraction;
+
+# Test session
+SET SESSION tokudb_analyze_delete_fraction = .5;
+SELECT @@session.tokudb_analyze_delete_fraction;
+
+SET SESSION tokudb_analyze_delete_fraction = 0;
+SELECT @@session.tokudb_analyze_delete_fraction;
+
+SET SESSION tokudb_analyze_delete_fraction = DEFAULT;
+SELECT @@session.tokudb_analyze_delete_fraction;
+
+-- error ER_WRONG_TYPE_FOR_VAR
+SET SESSION tokudb_analyze_delete_fraction = 'foobar';
+SELECT @@session.tokudb_analyze_delete_fraction;
+
+SET SESSION tokudb_analyze_delete_fraction = 3.75;
+SELECT @@session.tokudb_analyze_delete_fraction;
+
+# both
+SET GLOBAL tokudb_analyze_delete_fraction = .2;
+SET SESSION tokudb_analyze_delete_fraction = .3;
+SELECT @@global.tokudb_analyze_delete_fraction;
+SELECT @@session.tokudb_analyze_delete_fraction;
+SHOW VARIABLES LIKE 'tokudb_analyze_delete_fraction';
+
+# Clean up
+SET SESSION tokudb_analyze_delete_fraction = @orig_session;
+SELECT @@session.tokudb_analyze_delete_fraction;
+
+SET GLOBAL tokudb_analyze_delete_fraction = @orig_global;
+SELECT @@global.tokudb_analyze_delete_fraction;

mysql-test/suite/tokudb.sys_vars/t/tokudb_analyze_in_background_basic.test

+--source include/have_tokudb.inc
+
+# Check the default value
+SET @orig_global = @@global.tokudb_analyze_in_background;
+SELECT @orig_global;
+
+SET @orig_session = @@session.tokudb_analyze_in_background;
+SELECT @orig_session;
+
+# Test global
+SET GLOBAL tokudb_analyze_in_background = 0;
+SELECT @@global.tokudb_analyze_in_background;
+
+SET GLOBAL tokudb_analyze_in_background = 1;
+SELECT @@global.tokudb_analyze_in_background;
+
+SET GLOBAL tokudb_analyze_in_background = DEFAULT;
+SELECT @@global.tokudb_analyze_in_background;
+
+SET GLOBAL tokudb_analyze_in_background = -6;
+SELECT @@global.tokudb_analyze_in_background;
+
+-- error ER_WRONG_TYPE_FOR_VAR
+SET GLOBAL tokudb_analyze_in_background = 1.6;
+SELECT @@global.tokudb_analyze_in_background;
+
+-- error ER_WRONG_VALUE_FOR_VAR
+SET GLOBAL tokudb_analyze_in_background = "T";
+SELECT @@global.tokudb_analyze_in_background;
+
+-- error ER_WRONG_VALUE_FOR_VAR
+SET GLOBAL tokudb_analyze_in_background = "Y";
+SELECT @@global.tokudb_analyze_in_background;
+
+-- error ER_WRONG_VALUE_FOR_VAR
+SET GLOBAL tokudb_analyze_in_background = 'foobar';
+SELECT @@global.tokudb_analyze_in_background;
+
+# Test session
+SET SESSION tokudb_analyze_in_background = 0;
+SELECT @@session.tokudb_analyze_in_background;
+
+SET SESSION tokudb_analyze_in_background = 1;
+SELECT @@session.tokudb_analyze_in_background;
+
+SET SESSION tokudb_analyze_in_background = DEFAULT;
+SELECT @@session.tokudb_analyze_in_background;
+
+SET SESSION tokudb_analyze_in_background = -6;
+SELECT @@session.tokudb_analyze_in_background;
+
+-- error ER_WRONG_TYPE_FOR_VAR
+SET SESSION tokudb_analyze_in_background = 1.6;
+SELECT @@session.tokudb_analyze_in_background;
+
+-- error ER_WRONG_VALUE_FOR_VAR
+SET SESSION tokudb_analyze_in_background = "T";
+SELECT @@session.tokudb_analyze_in_background;
+
+-- error ER_WRONG_VALUE_FOR_VAR
+SET SESSION tokudb_analyze_in_background = "Y";
+SELECT @@session.tokudb_analyze_in_background;
+
+-- error ER_WRONG_VALUE_FOR_VAR
+SET SESSION tokudb_analyze_in_background = 'foobar';
+SELECT @@session.tokudb_analyze_in_background;
+
+# both
+SET GLOBAL tokudb_analyze_in_background = 0;
+SET SESSION tokudb_analyze_in_background = 1;
+SELECT @@global.tokudb_analyze_in_background;
+SELECT @@session.tokudb_analyze_in_background;
+SHOW VARIABLES LIKE 'tokudb_analyze_in_background';
+
+# Clean up
+SET SESSION tokudb_analyze_in_background = @orig_session;
+SELECT @@session.tokudb_analyze_in_background;
+
+SET GLOBAL tokudb_analyze_in_background = @orig_global;
+SELECT @@global.tokudb_analyze_in_background;

mysql-test/suite/tokudb.sys_vars/t/tokudb_analyze_mode_basic.test

+--source include/have_tokudb.inc
+
+# Check the default value
+SET @orig_global = @@global.tokudb_analyze_mode;
+SELECT @orig_global;
+
+SET @orig_session = @@session.tokudb_analyze_mode;
+SELECT @orig_session;
+
+# Test global
+SET GLOBAL tokudb_analyze_mode = 'tokudb_analyze_standard';
+SELECT @@global.tokudb_analyze_mode;
+
+SET GLOBAL tokudb_analyze_mode = 'tokudb_analyze_recount_rows';
+SELECT @@global.tokudb_analyze_mode;
+
+SET GLOBAL tokudb_analyze_mode = 'tokudb_analyze_cancel';
+SELECT @@global.tokudb_analyze_mode;
+
+SET GLOBAL tokudb_analyze_mode = DEFAULT;
+SELECT @@global.tokudb_analyze_mode;
+
+-- error ER_WRONG_VALUE_FOR_VAR
+SET GLOBAL tokudb_analyze_mode = '';
+SELECT @@global.tokudb_analyze_mode;
+
+-- error ER_WRONG_VALUE_FOR_VAR
+SET GLOBAL tokudb_analyze_mode = 'foobar';
+SELECT @@global.tokudb_analyze_mode;
+
+-- error ER_WRONG_VALUE_FOR_VAR
+SET GLOBAL tokudb_analyze_mode = 123;
+SELECT @@global.tokudb_analyze_mode;
+
+# Test session
+SET SESSION tokudb_analyze_mode = 'tokudb_analyze_standard';
+SELECT @@session.tokudb_analyze_mode;
+
+SET SESSION tokudb_analyze_mode = 'tokudb_analyze_recount_rows';
+SELECT @@session.tokudb_analyze_mode;
+
+SET SESSION tokudb_analyze_mode = 'tokudb_analyze_cancel';
+SELECT @@session.tokudb_analyze_mode;
+
+SET SESSION tokudb_analyze_mode = DEFAULT;
+SELECT @@session.tokudb_analyze_mode;
+
+-- error ER_WRONG_VALUE_FOR_VAR
+SET SESSION tokudb_analyze_mode = '';
+SELECT @@session.tokudb_analyze_mode;
+
+-- error ER_WRONG_VALUE_FOR_VAR
+SET SESSION tokudb_analyze_mode = 'foobar';
+SELECT @@session.tokudb_analyze_mode;
+
+-- error ER_WRONG_VALUE_FOR_VAR
+SET SESSION tokudb_analyze_mode = 123;
+SELECT @@session.tokudb_analyze_mode;
+
+# both
+SET GLOBAL tokudb_analyze_mode = 'tokudb_analyze_standard';
+SET SESSION tokudb_analyze_mode = 'tokudb_analyze_recount_rows';
+SELECT @@global.tokudb_analyze_mode;
+SELECT @@session.tokudb_analyze_mode;
+SHOW VARIABLES LIKE 'tokudb_analyze_mode';
+
+# Clean up
+SET SESSION tokudb_analyze_mode = @orig_session;
+SELECT @@session.tokudb_analyze_mode;
+
+SET GLOBAL tokudb_analyze_mode = @orig_global;
+SELECT @@global.tokudb_analyze_mode;

mysql-test/suite/tokudb.sys_vars/t/tokudb_analyze_throttle_basic.test

+--source include/have_tokudb.inc
+
+# Check the default value
+SET @orig_global = @@global.tokudb_analyze_throttle;
+SELECT @orig_global;
+
+SET @orig_session = @@session.tokudb_analyze_throttle;
+SELECT @orig_session;
+
+# Test global
+SET GLOBAL tokudb_analyze_throttle = 10;
+SELECT @@global.tokudb_analyze_throttle;
+
+SET GLOBAL tokudb_analyze_throttle = 0;
+SELECT @@global.tokudb_analyze_throttle;
+
+SET GLOBAL tokudb_analyze_throttle = DEFAULT;
+SELECT @@global.tokudb_analyze_throttle;
+
+-- error ER_WRONG_TYPE_FOR_VAR
+SET GLOBAL tokudb_analyze_throttle = 'foobar';
+SELECT @@global.tokudb_analyze_throttle;
+
+# Test session
+SET SESSION tokudb_analyze_throttle = 10;
+SELECT @@session.tokudb_analyze_throttle;
+
+SET SESSION tokudb_analyze_throttle = 0;
+SELECT @@session.tokudb_analyze_throttle;
+
+SET SESSION tokudb_analyze_throttle = DEFAULT;
+SELECT @@session.tokudb_analyze_throttle;
+
+-- error ER_WRONG_TYPE_FOR_VAR
+SET SESSION tokudb_analyze_throttle = 'foobar';
+SELECT @@session.tokudb_analyze_throttle;
+
+# both
+SET GLOBAL tokudb_analyze_throttle = 12;
+SET SESSION tokudb_analyze_throttle = 13;
+SELECT @@global.tokudb_analyze_throttle;
+SELECT @@session.tokudb_analyze_throttle;
+SHOW VARIABLES LIKE 'tokudb_analyze_throttle';
+
+# Clean up
+SET SESSION tokudb_analyze_throttle = @orig_session;
+SELECT @@session.tokudb_analyze_throttle;
+
+SET GLOBAL tokudb_analyze_throttle = @orig_global;
+SELECT @@global.tokudb_analyze_throttle;

mysql-test/suite/tokudb.sys_vars/t/tokudb_analyze_time_basic.test

+--source include/have_tokudb.inc
+
+# Check the default value
+SET @orig_global = @@global.tokudb_analyze_time;
+SELECT @orig_global;
+
+SET @orig_session = @@session.tokudb_analyze_time;
+SELECT @orig_session;
+
+# Test global
+SET GLOBAL tokudb_analyze_time = 10;
+SELECT @@global.tokudb_analyze_time;
+
+SET GLOBAL tokudb_analyze_time = 0;
+SELECT @@global.tokudb_analyze_time;
+
+SET GLOBAL tokudb_analyze_time = DEFAULT;
+SELECT @@global.tokudb_analyze_time;
+
+-- error ER_WRONG_TYPE_FOR_VAR
+SET GLOBAL tokudb_analyze_time = 'foobar';
+SELECT @@global.tokudb_analyze_time;
+
+# Test session
+SET SESSION tokudb_analyze_time = 10;
+SELECT @@session.tokudb_analyze_time;
+
+SET SESSION tokudb_analyze_time = 0;
+SELECT @@session.tokudb_analyze_time;
+
+SET SESSION tokudb_analyze_time = DEFAULT;
+SELECT @@session.tokudb_analyze_time;
+
+-- error ER_WRONG_TYPE_FOR_VAR
+SET SESSION tokudb_analyze_time = 'foobar';
+SELECT @@session.tokudb_analyze_time;
+
+# both
+SET GLOBAL tokudb_analyze_time = 12;
+SET SESSION tokudb_analyze_time = 13;
+SELECT @@global.tokudb_analyze_time;
+SELECT @@session.tokudb_analyze_time;
+SHOW VARIABLES LIKE 'tokudb_analyze_time';
+
+# Clean up
+SET SESSION tokudb_analyze_time = @orig_session;
+SELECT @@session.tokudb_analyze_time;
+
+SET GLOBAL tokudb_analyze_time = @orig_global;
+SELECT @@global.tokudb_analyze_time;

mysql-test/suite/tokudb.sys_vars/t/tokudb_auto_analyze.test

+--source include/have_tokudb.inc
+
+# Check the default value
+SET @orig_global = @@global.tokudb_auto_analyze;
+SELECT @orig_global;
+
+SET @orig_session = @@session.tokudb_auto_analyze;
+SELECT @orig_session;
+
+# Test global
+SET GLOBAL tokudb_auto_analyze = 10;
+SELECT @@global.tokudb_auto_analyze;
+
+SET GLOBAL tokudb_auto_analyze = 0;
+SELECT @@global.tokudb_auto_analyze;
+
+SET GLOBAL tokudb_auto_analyze = DEFAULT;
+SELECT @@global.tokudb_auto_analyze;
+
+-- error ER_WRONG_TYPE_FOR_VAR
+SET GLOBAL tokudb_auto_analyze = 'foobar';
+SELECT @@global.tokudb_auto_analyze;
+
+# Test session
+SET SESSION tokudb_auto_analyze = 10;
+SELECT @@session.tokudb_auto_analyze;
+
+SET SESSION tokudb_auto_analyze = 0;
+SELECT @@session.tokudb_auto_analyze;
+
+SET SESSION tokudb_auto_analyze = DEFAULT;
+SELECT @@session.tokudb_auto_analyze;
+
+-- error ER_WRONG_TYPE_FOR_VAR
+SET SESSION tokudb_auto_analyze = 'foobar';
+SELECT @@session.tokudb_auto_analyze;
+
+# both
+SET GLOBAL tokudb_auto_analyze = 12;
+SET SESSION tokudb_auto_analyze = 13;
+SELECT @@global.tokudb_auto_analyze;
+SELECT @@session.tokudb_auto_analyze;
+SHOW VARIABLES LIKE 'tokudb_auto_analyze';
+
+# Clean up
+SET SESSION tokudb_auto_analyze = @orig_session;
+SELECT @@session.tokudb_auto_analyze;
+
+SET GLOBAL tokudb_auto_analyze = @orig_global;
+SELECT @@global.tokudb_auto_analyze;

mysql-test/suite/tokudb.sys_vars/t/tokudb_cardinality_scale_percent_basic.test

+--source include/have_tokudb.inc
+
+# Check the default value
+SET @orig_global = @@global.tokudb_cardinality_scale_percent;
+SELECT @orig_global;
+
+# Test global
+SET GLOBAL tokudb_cardinality_scale_percent = 10;
+SELECT @@global.tokudb_cardinality_scale_percent;
+
+SET GLOBAL tokudb_cardinality_scale_percent = 0;
+SELECT @@global.tokudb_cardinality_scale_percent;
+
+SET GLOBAL tokudb_cardinality_scale_percent = DEFAULT;
+SELECT @@global.tokudb_cardinality_scale_percent;
+
+-- error ER_WRONG_TYPE_FOR_VAR
+SET GLOBAL tokudb_cardinality_scale_percent = 'foobar';
+SELECT @@global.tokudb_cardinality_scale_percent;
+
+# both
+SET GLOBAL tokudb_cardinality_scale_percent = 12;
+-- error ER_GLOBAL_VARIABLE
+SET SESSION tokudb_cardinality_scale_percent = 13;
+SELECT @@global.tokudb_cardinality_scale_percent;
+-- error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT @@session.tokudb_cardinality_scale_percent;
+SHOW VARIABLES LIKE 'tokudb_cardinality_scale_percent';
+
+# Clean up
+SET GLOBAL tokudb_cardinality_scale_percent = @orig_global;
+SELECT @@global.tokudb_cardinality_scale_percent;

mysql-test/suite/tokudb/r/card_add_drop.result

@@ -4,35 +4,35 @@ create table tt (a int, b int, c int, d int, key(a), key(b), key(c));
 insert into tt values (0,0,0,0),(1,0,0,0),(2,0,1,0),(3,0,1,0);
 show indexes from tt;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
-tt	1	a	1	a	A	NULL	NULL	NULL	YES	BTREE		
-tt	1	b	1	b	A	NULL	NULL	NULL	YES	BTREE		
-tt	1	c	1	c	A	NULL	NULL	NULL	YES	BTREE		
+tt	1	a	1	a	A	4	NULL	NULL	YES	BTREE		
+tt	1	b	1	b	A	4	NULL	NULL	YES	BTREE		
+tt	1	c	1	c	A	4	NULL	NULL	YES	BTREE		
 analyze table tt;
 Table	Op	Msg_type	Msg_text
 test.tt	analyze	status	OK
 show indexes from tt;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 tt	1	a	1	a	A	4	NULL	NULL	YES	BTREE		
-tt	1	b	1	b	A	1	NULL	NULL	YES	BTREE		
-tt	1	c	1	c	A	2	NULL	NULL	YES	BTREE		
+tt	1	b	1	b	A	2	NULL	NULL	YES	BTREE		
+tt	1	c	1	c	A	4	NULL	NULL	YES	BTREE		
 alter table tt drop key b, add key (d);
 show indexes from tt;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 tt	1	a	1	a	A	4	NULL	NULL	YES	BTREE		
-tt	1	c	1	c	A	2	NULL	NULL	YES	BTREE		
-tt	1	d	1	d	A	NULL	NULL	NULL	YES	BTREE		
+tt	1	c	1	c	A	4	NULL	NULL	YES	BTREE		
+tt	1	d	1	d	A	4	NULL	NULL	YES	BTREE		
 analyze table tt;
 Table	Op	Msg_type	Msg_text
 test.tt	analyze	status	OK
 show indexes from tt;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 tt	1	a	1	a	A	4	NULL	NULL	YES	BTREE		
-tt	1	c	1	c	A	2	NULL	NULL	YES	BTREE		
-tt	1	d	1	d	A	1	NULL	NULL	YES	BTREE		
+tt	1	c	1	c	A	4	NULL	NULL	YES	BTREE		
+tt	1	d	1	d	A	2	NULL	NULL	YES	BTREE		
 flush tables;
 show indexes from tt;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 tt	1	a	1	a	A	4	NULL	NULL	YES	BTREE		
-tt	1	c	1	c	A	2	NULL	NULL	YES	BTREE		
-tt	1	d	1	d	A	1	NULL	NULL	YES	BTREE		
+tt	1	c	1	c	A	4	NULL	NULL	YES	BTREE		
+tt	1	d	1	d	A	2	NULL	NULL	YES	BTREE		
 drop table tt;

mysql-test/suite/tokudb/r/card_add_index.result

@@ -15,32 +15,32 @@ alter table tt add key (b);
 show indexes from tt;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 tt	0	PRIMARY	1	a	A	4	NULL	NULL		BTREE		
-tt	1	b	1	b	A	NULL	NULL	NULL	YES	BTREE		
+tt	1	b	1	b	A	4	NULL	NULL	YES	BTREE		
 analyze table tt;
 Table	Op	Msg_type	Msg_text
 test.tt	analyze	status	OK
 show indexes from tt;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 tt	0	PRIMARY	1	a	A	4	NULL	NULL		BTREE		
-tt	1	b	1	b	A	1	NULL	NULL	YES	BTREE		
+tt	1	b	1	b	A	2	NULL	NULL	YES	BTREE		
 alter table tt add key (c);
 show indexes from tt;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 tt	0	PRIMARY	1	a	A	4	NULL	NULL		BTREE		
-tt	1	b	1	b	A	1	NULL	NULL	YES	BTREE		
-tt	1	c	1	c	A	NULL	NULL	NULL	YES	BTREE		
+tt	1	b	1	b	A	2	NULL	NULL	YES	BTREE		
+tt	1	c	1	c	A	4	NULL	NULL	YES	BTREE		
 analyze table tt;
 Table	Op	Msg_type	Msg_text
 test.tt	analyze	status	OK
 show indexes from tt;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 tt	0	PRIMARY	1	a	A	4	NULL	NULL		BTREE		
-tt	1	b	1	b	A	1	NULL	NULL	YES	BTREE		
-tt	1	c	1	c	A	2	NULL	NULL	YES	BTREE		
+tt	1	b	1	b	A	2	NULL	NULL	YES	BTREE		
+tt	1	c	1	c	A	4	NULL	NULL	YES	BTREE		
 flush tables;
 show indexes from tt;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 tt	0	PRIMARY	1	a	A	4	NULL	NULL		BTREE		
-tt	1	b	1	b	A	1	NULL	NULL	YES	BTREE		
-tt	1	c	1	c	A	2	NULL	NULL	YES	BTREE		
+tt	1	b	1	b	A	2	NULL	NULL	YES	BTREE		
+tt	1	c	1	c	A	4	NULL	NULL	YES	BTREE		
 drop table tt;