1 files changed, 107 insertions, 115 deletions

diff --git a/storage/tokudb/mysql-test/tokudb/r/fast_update_binlog_statement.result b/storage/tokudb/mysql-test/tokudb/r/fast_update_binlog_statement.result
index b21d58d2754..7d974affb9d 100644
--- a/storage/tokudb/mysql-test/tokudb/r/fast_update_binlog_statement.result
+++ b/storage/tokudb/mysql-test/tokudb/r/fast_update_binlog_statement.result
@@ -3,21 +3,13 @@ Warnings:
 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]
-set default_storage_engine='tokudb';
-create table tt (id int primary key, x int);
-set session tokudb_disable_slow_upsert=1;
-show variables like 'binlog_format';
-Variable_name	Value
-binlog_format	STATEMENT
-show variables like 'server_id';
-Variable_name	Value
-server_id	1
-show variables like 'binlog_format';
-Variable_name	Value
-binlog_format	STATEMENT
-show variables like 'server_id';
-Variable_name	Value
-server_id	2
+create table tt (id int primary key, x int) engine = tokudb;
+set session sql_mode=(select replace(@@sql_mode,'STRICT_TRANS_TABLES',''));
+set session sql_mode=(select replace(@@sql_mode,'STRICT_ALL_TABLES',''));
+set session tokudb_enable_fast_update=1;
+set session sql_mode=(select replace(@@sql_mode,'STRICT_TRANS_TABLES',''));
+set session sql_mode=(select replace(@@sql_mode,'STRICT_ALL_TABLES',''));
+set session tokudb_enable_fast_update=1;
 insert into tt values (0,0) on duplicate key update x=x+1;
 insert into tt values (1,0) on duplicate key update x=x+1;
 insert into tt values (2,0) on duplicate key update x=x+1;
@@ -218,106 +210,106 @@ insert into tt values (96,0) on duplicate key update x=x+1;
 insert into tt values (97,0) on duplicate key update x=x+1;
 insert into tt values (98,0) on duplicate key update x=x+1;
 insert into tt values (99,0) on duplicate key update x=x+1;
-update noar tt set x=x+1 where id=0;
-update noar tt set x=x+1 where id=1;
-update noar tt set x=x+1 where id=2;
-update noar tt set x=x+1 where id=3;
-update noar tt set x=x+1 where id=4;
-update noar tt set x=x+1 where id=5;
-update noar tt set x=x+1 where id=6;
-update noar tt set x=x+1 where id=7;
-update noar tt set x=x+1 where id=8;
-update noar tt set x=x+1 where id=9;
-update noar tt set x=x+1 where id=10;
-update noar tt set x=x+1 where id=11;
-update noar tt set x=x+1 where id=12;
-update noar tt set x=x+1 where id=13;
-update noar tt set x=x+1 where id=14;
-update noar tt set x=x+1 where id=15;
-update noar tt set x=x+1 where id=16;
-update noar tt set x=x+1 where id=17;
-update noar tt set x=x+1 where id=18;
-update noar tt set x=x+1 where id=19;
-update noar tt set x=x+1 where id=20;
-update noar tt set x=x+1 where id=21;
-update noar tt set x=x+1 where id=22;
-update noar tt set x=x+1 where id=23;
-update noar tt set x=x+1 where id=24;
-update noar tt set x=x+1 where id=25;
-update noar tt set x=x+1 where id=26;
-update noar tt set x=x+1 where id=27;
-update noar tt set x=x+1 where id=28;
-update noar tt set x=x+1 where id=29;
-update noar tt set x=x+1 where id=30;
-update noar tt set x=x+1 where id=31;
-update noar tt set x=x+1 where id=32;
-update noar tt set x=x+1 where id=33;
-update noar tt set x=x+1 where id=34;
-update noar tt set x=x+1 where id=35;
-update noar tt set x=x+1 where id=36;
-update noar tt set x=x+1 where id=37;
-update noar tt set x=x+1 where id=38;
-update noar tt set x=x+1 where id=39;
-update noar tt set x=x+1 where id=40;
-update noar tt set x=x+1 where id=41;
-update noar tt set x=x+1 where id=42;
-update noar tt set x=x+1 where id=43;
-update noar tt set x=x+1 where id=44;
-update noar tt set x=x+1 where id=45;
-update noar tt set x=x+1 where id=46;
-update noar tt set x=x+1 where id=47;
-update noar tt set x=x+1 where id=48;
-update noar tt set x=x+1 where id=49;
-update noar tt set x=x+1 where id=50;
-update noar tt set x=x+1 where id=51;
-update noar tt set x=x+1 where id=52;
-update noar tt set x=x+1 where id=53;
-update noar tt set x=x+1 where id=54;
-update noar tt set x=x+1 where id=55;
-update noar tt set x=x+1 where id=56;
-update noar tt set x=x+1 where id=57;
-update noar tt set x=x+1 where id=58;
-update noar tt set x=x+1 where id=59;
-update noar tt set x=x+1 where id=60;
-update noar tt set x=x+1 where id=61;
-update noar tt set x=x+1 where id=62;
-update noar tt set x=x+1 where id=63;
-update noar tt set x=x+1 where id=64;
-update noar tt set x=x+1 where id=65;
-update noar tt set x=x+1 where id=66;
-update noar tt set x=x+1 where id=67;
-update noar tt set x=x+1 where id=68;
-update noar tt set x=x+1 where id=69;
-update noar tt set x=x+1 where id=70;
-update noar tt set x=x+1 where id=71;
-update noar tt set x=x+1 where id=72;
-update noar tt set x=x+1 where id=73;
-update noar tt set x=x+1 where id=74;
-update noar tt set x=x+1 where id=75;
-update noar tt set x=x+1 where id=76;
-update noar tt set x=x+1 where id=77;
-update noar tt set x=x+1 where id=78;
-update noar tt set x=x+1 where id=79;
-update noar tt set x=x+1 where id=80;
-update noar tt set x=x+1 where id=81;
-update noar tt set x=x+1 where id=82;
-update noar tt set x=x+1 where id=83;
-update noar tt set x=x+1 where id=84;
-update noar tt set x=x+1 where id=85;
-update noar tt set x=x+1 where id=86;
-update noar tt set x=x+1 where id=87;
-update noar tt set x=x+1 where id=88;
-update noar tt set x=x+1 where id=89;
-update noar tt set x=x+1 where id=90;
-update noar tt set x=x+1 where id=91;
-update noar tt set x=x+1 where id=92;
-update noar tt set x=x+1 where id=93;
-update noar tt set x=x+1 where id=94;
-update noar tt set x=x+1 where id=95;
-update noar tt set x=x+1 where id=96;
-update noar tt set x=x+1 where id=97;
-update noar tt set x=x+1 where id=98;
-update noar tt set x=x+1 where id=99;
+update tt set x=x+1 where id=0;
+update tt set x=x+1 where id=1;
+update tt set x=x+1 where id=2;
+update tt set x=x+1 where id=3;
+update tt set x=x+1 where id=4;
+update tt set x=x+1 where id=5;
+update tt set x=x+1 where id=6;
+update tt set x=x+1 where id=7;
+update tt set x=x+1 where id=8;
+update tt set x=x+1 where id=9;
+update tt set x=x+1 where id=10;
+update tt set x=x+1 where id=11;
+update tt set x=x+1 where id=12;
+update tt set x=x+1 where id=13;
+update tt set x=x+1 where id=14;
+update tt set x=x+1 where id=15;
+update tt set x=x+1 where id=16;
+update tt set x=x+1 where id=17;
+update tt set x=x+1 where id=18;
+update tt set x=x+1 where id=19;
+update tt set x=x+1 where id=20;
+update tt set x=x+1 where id=21;
+update tt set x=x+1 where id=22;
+update tt set x=x+1 where id=23;
+update tt set x=x+1 where id=24;
+update tt set x=x+1 where id=25;
+update tt set x=x+1 where id=26;
+update tt set x=x+1 where id=27;
+update tt set x=x+1 where id=28;
+update tt set x=x+1 where id=29;
+update tt set x=x+1 where id=30;
+update tt set x=x+1 where id=31;
+update tt set x=x+1 where id=32;
+update tt set x=x+1 where id=33;
+update tt set x=x+1 where id=34;
+update tt set x=x+1 where id=35;
+update tt set x=x+1 where id=36;
+update tt set x=x+1 where id=37;
+update tt set x=x+1 where id=38;
+update tt set x=x+1 where id=39;
+update tt set x=x+1 where id=40;
+update tt set x=x+1 where id=41;
+update tt set x=x+1 where id=42;
+update tt set x=x+1 where id=43;
+update tt set x=x+1 where id=44;
+update tt set x=x+1 where id=45;
+update tt set x=x+1 where id=46;
+update tt set x=x+1 where id=47;
+update tt set x=x+1 where id=48;
+update tt set x=x+1 where id=49;
+update tt set x=x+1 where id=50;
+update tt set x=x+1 where id=51;
+update tt set x=x+1 where id=52;
+update tt set x=x+1 where id=53;
+update tt set x=x+1 where id=54;
+update tt set x=x+1 where id=55;
+update tt set x=x+1 where id=56;
+update tt set x=x+1 where id=57;
+update tt set x=x+1 where id=58;
+update tt set x=x+1 where id=59;
+update tt set x=x+1 where id=60;
+update tt set x=x+1 where id=61;
+update tt set x=x+1 where id=62;
+update tt set x=x+1 where id=63;
+update tt set x=x+1 where id=64;
+update tt set x=x+1 where id=65;
+update tt set x=x+1 where id=66;
+update tt set x=x+1 where id=67;
+update tt set x=x+1 where id=68;
+update tt set x=x+1 where id=69;
+update tt set x=x+1 where id=70;
+update tt set x=x+1 where id=71;
+update tt set x=x+1 where id=72;
+update tt set x=x+1 where id=73;
+update tt set x=x+1 where id=74;
+update tt set x=x+1 where id=75;
+update tt set x=x+1 where id=76;
+update tt set x=x+1 where id=77;
+update tt set x=x+1 where id=78;
+update tt set x=x+1 where id=79;
+update tt set x=x+1 where id=80;
+update tt set x=x+1 where id=81;
+update tt set x=x+1 where id=82;
+update tt set x=x+1 where id=83;
+update tt set x=x+1 where id=84;
+update tt set x=x+1 where id=85;
+update tt set x=x+1 where id=86;
+update tt set x=x+1 where id=87;
+update tt set x=x+1 where id=88;
+update tt set x=x+1 where id=89;
+update tt set x=x+1 where id=90;
+update tt set x=x+1 where id=91;
+update tt set x=x+1 where id=92;
+update tt set x=x+1 where id=93;
+update tt set x=x+1 where id=94;
+update tt set x=x+1 where id=95;
+update tt set x=x+1 where id=96;
+update tt set x=x+1 where id=97;
+update tt set x=x+1 where id=98;
+update tt set x=x+1 where id=99;
 select * from tt where x != 2;
 id	x
 include/diff_tables.inc [master:test.tt, slave:test.tt]