1 files changed, 34 insertions, 32 deletions
diff --git a/storage/tokudb/mysql-test/tokudb/t/fast_update_char.test b/storage/tokudb/mysql-test/tokudb/t/fast_update_char.test
index 2ee6fbd79ee..17364845942 100644
--- a/storage/tokudb/mysql-test/tokudb/t/fast_update_char.test
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_update_char.test
@@ -4,94 +4,96 @@
 source include/have_tokudb.inc;
 source include/have_innodb.inc;
 
-set default_storage_engine='tokudb';
+set tokudb_enable_fast_update=1;
+source ../include/setup_fast_update_upsert.inc;
 
-disable_warnings;
-drop table if exists tt, ti;
-enable_warnings;
-
-set tokudb_disable_slow_update=1;
-
-create table tt (id int primary key, c char(32), b binary(32));
+create table tt (id int primary key, c char(32), b binary(32)) engine = tokudb;
 create table ti like tt;
 alter table ti engine=innodb;
 
 insert into tt values (1,null,null);
 insert into ti values (1,null,null);
 
-update noar tt set c='hi' where id=1;
-update noar ti set c='hi' where id=1;
+update tt set c='hi' where id=1;
+update ti set c='hi' where id=1;
 let $diff_tables = test.tt, test.ti;
 source include/diff_tables.inc;
 
-update noar tt set c='there' where id=1;
-update noar ti set c='there' where id=1;
+update tt set c='there' where id=1;
+update ti set c='there' where id=1;
 let $diff_tables = test.tt, test.ti;
 source include/diff_tables.inc;
 
 drop table tt, ti;
 
-create table tt (id char(8) primary key, c char(32), b binary(32));
+create table tt (id char(8) primary key,
+                 c char(32),
+                 b binary(32)) engine = tokudb;
 create table ti like tt;
 alter table ti engine=innodb;
 
 insert into tt values ('1',null,null);
 insert into ti values ('1',null,null);
 
-update noar tt set c='hi' where id='1';
-update noar ti set c='hi' where id='1';
+update tt set c='hi' where id='1';
+update ti set c='hi' where id='1';
 let $diff_tables = test.tt, test.ti;
 source include/diff_tables.inc;
 
-update noar tt set c='there' where id='1';
-update noar ti set c='there' where id='1';
+update tt set c='there' where id='1';
+update ti set c='there' where id='1';
 let $diff_tables = test.tt, test.ti;
 source include/diff_tables.inc;
 
 drop table tt, ti;
 
-create table tt (id varchar(8) primary key, a int, b char(32), c char(32), d binary(32));
+create table tt (id varchar(8) primary key,
+                 a int,
+                 b char(32),
+                 c char(32),
+                 d binary(32)) engine = tokudb;
 create table ti like tt;
 alter table ti engine=innodb;
 
 insert into tt values ('1',null,null,null,null);
 insert into ti values ('1',null,null,null,null);
 
-update noar tt set b='hi' where id='1';
-update noar ti set b='hi' where id='1';
+update tt set b='hi' where id='1';
+update ti set b='hi' where id='1';
 let $diff_tables = test.tt, test.ti;
 source include/diff_tables.inc;
 
-update noar tt set c='there' where id='1';
-update noar ti set c='there' where id='1';
+update tt set c='there' where id='1';
+update ti set c='there' where id='1';
 let $diff_tables = test.tt, test.ti;
 source include/diff_tables.inc;
 
 drop table tt, ti;
 
-create table tt (id varchar(8) primary key, a int, b char(32), c char(32), d binary(32));
+create table tt (id varchar(8) primary key,
+                 a int,
+                 b char(32),
+                 c char(32),
+                 d binary(32)) engine = tokudb;
 create table ti like tt;
 alter table ti engine=innodb;
 
 insert into tt values ('1',null,null,null,null);
 insert into ti values ('1',null,null,null,null);
 
-update noar tt set b='123' where id='1';
-update noar ti set b='123' where id='1';
+update tt set b='123' where id='1';
+update ti set b='123' where id='1';
 let $diff_tables = test.tt, test.ti;
 source include/diff_tables.inc;
 
-update noar tt set c=456 where id='1';
-update noar ti set c=456 where id='1';
+update tt set c=456 where id='1';
+update ti set c=456 where id='1';
 let $diff_tables = test.tt, test.ti;
 source include/diff_tables.inc;
 
-update noar tt set c=789 where id=1;
-update noar ti set c=789 where id=1;
+update tt set c=789 where id=1;
+update ti set c=789 where id=1;
 let $diff_tables = test.tt, test.ti;
 source include/diff_tables.inc;
 
 drop table tt, ti;
-
-
-