1 files changed, 35 insertions, 19 deletions
diff --git a/storage/tokudb/mysql-test/tokudb/r/fast_update_key.result b/storage/tokudb/mysql-test/tokudb/r/fast_update_key.result
index fd819add354..c6f14e18ee4 100644
--- a/storage/tokudb/mysql-test/tokudb/r/fast_update_key.result
+++ b/storage/tokudb/mysql-test/tokudb/r/fast_update_key.result
@@ -1,39 +1,55 @@
-set default_storage_engine='tokudb';
-drop table if exists t;
-set tokudb_disable_slow_update=1;
-create table t (ida int not null, idb bigint not null, idc tinyint unsigned not null, x bigint);
-update noar t set x=x+1 where ida=1;
+set 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',''));
+create table t (ida int not null,
+idb bigint not null,
+idc tinyint unsigned not null,
+x bigint) engine = tokudb;
+update t set x=x+1 where ida=1;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 drop table t;
-create table t (ida int not null, idb bigint not null, idc tinyint unsigned not null, x bigint, clustering key(ida,idb,idc));
-update noar t set x=x+1 where ida=1;
+create table t (ida int not null,
+idb bigint not null,
+idc tinyint unsigned not null,
+x bigint,
+clustering key(ida,idb,idc)) engine = tokudb;
+update t set x=x+1 where ida=1;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 drop table t;
-create table t (ida int not null, idb bigint not null, idc tinyint unsigned not null, x bigint, primary key(ida,idb,idc), key(x));
-update noar t set x=x+1 where ida=1;
+create table t (ida int not null,
+idb bigint not null,
+idc tinyint unsigned not null,
+x bigint,
+primary key(ida,idb,idc),
+key(x)) engine = tokudb;
+update t set x=x+1 where ida=1;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 drop table t;
-create table t (id char(32), x bigint, primary key(id(1)));
-update noar t set x=x+1 where id='hi';
+create table t (id char(32), x bigint, primary key(id(1))) engine = tokudb;
+update t set x=x+1 where id='hi';
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 drop table t;
-create table t (id varchar(32), x bigint, primary key(id(1)));
-update noar t set x=x+1 where id='hi';
+create table t (id varchar(32), x bigint, primary key(id(1))) engine = tokudb;
+update t set x=x+1 where id='hi';
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 drop table t;
-create table t (ida int not null, idb bigint not null, idc tinyint unsigned not null, x bigint, primary key(ida,idb,idc));
+create table t (ida int not null,
+idb bigint not null,
+idc tinyint unsigned not null,
+x bigint,
+primary key(ida,idb,idc)) engine = tokudb;
 insert into t values (1,2,3,0);
-update noar t set x=x+1 where ida=1;
+update t set x=x+1 where ida=1;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
-update noar t set x=x+1 where ida=1 and idb=2;
+update t set x=x+1 where ida=1 and idb=2;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
-update noar t set x=x+1 where ida=1 and idb=2 or idc=3;
+update t set x=x+1 where ida=1 and idb=2 or idc=3;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
-update noar t set x=x+1 where ida=1 and idb=2 and idc=3;
+update t set x=x+1 where ida=1 and idb=2 and idc=3;
 select * from t;
 ida	idb	idc	x
 1	2	3	1
-update noar t set x=x+1 where idc=3 and ida=1 and idb=2;
+update t set x=x+1 where idc=3 and ida=1 and idb=2;
 select * from t;
 ida	idb	idc	x
 1	2	3	2