1 files changed, 10 insertions, 17 deletions
diff --git a/storage/tokudb/mysql-test/tokudb/t/fast_upsert_sqlmode.test b/storage/tokudb/mysql-test/tokudb/t/fast_upsert_sqlmode.test
index b83918d3412..714d11890cf 100644
--- a/storage/tokudb/mysql-test/tokudb/t/fast_upsert_sqlmode.test
+++ b/storage/tokudb/mysql-test/tokudb/t/fast_upsert_sqlmode.test
@@ -1,36 +1,29 @@
 source include/have_tokudb.inc;
 
-set default_storage_engine='tokudb';
-
-disable_warnings;
-drop table if exists t;
-enable_warnings;
-
-set tokudb_disable_slow_upsert=1;
+set tokudb_enable_fast_upsert=1;
+source ../include/setup_fast_update_upsert.inc;
 
 let $default_sql_mode = `select @@session.sql_mode`;
 
-create table t (id int primary key, x int not null);
-insert noar into t values (1,0);
-insert noar into t values (1,0) on duplicate key update x=42;
-insert noar into t values (1,0) on duplicate key update x=x+1;
-insert noar into t values (1,0) on duplicate key update x=x-1;
+create table t (id int primary key, x int not null) engine = tokudb;
+insert into t values (1,0);
+insert into t values (1,0) on duplicate key update x=42;
+insert into t values (1,0) on duplicate key update x=x+1;
+insert into t values (1,0) on duplicate key update x=x-1;
 
 eval set session sql_mode="$default_sql_mode,traditional";
 
 replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
 error ER_UNSUPPORTED_EXTENSION;
-insert noar into t values (1,0) on duplicate key update x=42;
+insert into t values (1,0) on duplicate key update x=42;
 
 replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
 error ER_UNSUPPORTED_EXTENSION;
-insert noar into t values (1,0) on duplicate key update x=x+1;
+insert into t values (1,0) on duplicate key update x=x+1;
 
 replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
 error ER_UNSUPPORTED_EXTENSION;
-insert noar into t values (1,0) on duplicate key update x=x-1;
-
-eval set session sql_mode="$default_sql_mode";
+insert into t values (1,0) on duplicate key update x=x-1;
 
 drop table t;