1 files changed, 11 insertions, 12 deletions
diff --git a/storage/tokudb/mysql-test/tokudb/r/fast_upsert_sqlmode.result b/storage/tokudb/mysql-test/tokudb/r/fast_upsert_sqlmode.result
index 9b1fd60d691..30a6448b0a2 100644
--- a/storage/tokudb/mysql-test/tokudb/r/fast_upsert_sqlmode.result
+++ b/storage/tokudb/mysql-test/tokudb/r/fast_upsert_sqlmode.result
@@ -1,17 +1,16 @@
-set default_storage_engine='tokudb';
-drop table if exists t;
-set tokudb_disable_slow_upsert=1;
-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;
+set tokudb_enable_fast_upsert=1;
+set session sql_mode=(select replace(@@sql_mode,'STRICT_TRANS_TABLES',''));
+set session sql_mode=(select replace(@@sql_mode,'STRICT_ALL_TABLES',''));
+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;
 set session sql_mode="NO_ENGINE_SUBSTITUTION,traditional";
-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;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
-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;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
-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;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
-set session sql_mode="NO_ENGINE_SUBSTITUTION";
 drop table t;