Merge branch '10.1' into 10.2

1 files changed, 26 insertions, 26 deletions

diff --git a/storage/tokudb/mysql-test/tokudb/r/fast_update_int_bounds.result b/storage/tokudb/mysql-test/tokudb/r/fast_update_int_bounds.result
index 042cbcf0f70..12263b436f9 100644
--- a/storage/tokudb/mysql-test/tokudb/r/fast_update_int_bounds.result
+++ b/storage/tokudb/mysql-test/tokudb/r/fast_update_int_bounds.result
@@ -1,61 +1,61 @@
-set default_storage_engine='tokudb';
-drop table if exists t;
-create table tt (id int primary key, x int);
+create table tt (id int primary key, x int) engine = tokudb;
 insert into tt values (1,0),(2,-pow(2,31)),(3,pow(2,31)-1);
 create table ti like tt;
 alter table ti engine=innodb;
 insert into ti select * from tt;
-set tokudb_disable_slow_update=1;
-update noar tt set x=x+1 where id=1;
-update noar ti set x=x+1 where id=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',''));
+update tt set x=x+1 where id=1;
+update ti set x=x+1 where id=1;
 include/diff_tables.inc [test.tt, test.ti]
-update noar tt set x=x-2 where id=1;
-update noar ti set x=x-2 where id=1;
+update tt set x=x-2 where id=1;
+update ti set x=x-2 where id=1;
 include/diff_tables.inc [test.tt, test.ti]
-update noar tt set x=x+1 where id=1;
-update noar ti set x=x+1 where id=1;
+update tt set x=x+1 where id=1;
+update ti set x=x+1 where id=1;
 include/diff_tables.inc [test.tt, test.ti]
-update noar tt set x=x-1 where id=2;
-update noar ti set x=x-1 where id=2;
+update tt set x=x-1 where id=2;
+update ti set x=x-1 where id=2;
 Warnings:
 Warning	1264	Out of range value for column 'x' at row 1
 include/diff_tables.inc [test.tt, test.ti]
-update noar tt set x=x+1 where id=2;
-update noar ti set x=x+1 where id=2;
+update tt set x=x+1 where id=2;
+update ti set x=x+1 where id=2;
 include/diff_tables.inc [test.tt, test.ti]
-update noar tt set x=x+1 where id=3;
-update noar ti set x=x+1 where id=3;
+update tt set x=x+1 where id=3;
+update ti set x=x+1 where id=3;
 Warnings:
 Warning	1264	Out of range value for column 'x' at row 1
 include/diff_tables.inc [test.tt, test.ti]
-update noar tt set x=x-1 where id=3;
-update noar ti set x=x-1 where id=3;
+update tt set x=x-1 where id=3;
+update ti set x=x-1 where id=3;
 include/diff_tables.inc [test.tt, test.ti]
 insert into tt values (4,pow(2,31)-10);
 insert into ti values (4,pow(2,31)-10);
-update noar tt set x=x+20 where id=4;
-update noar ti set x=x+20 where id=4;
+update tt set x=x+20 where id=4;
+update ti set x=x+20 where id=4;
 Warnings:
 Warning	1264	Out of range value for column 'x' at row 1
 include/diff_tables.inc [test.tt, test.ti]
 insert into tt values (5,pow(2,31)-10);
 insert into ti values (5,pow(2,31)-10);
-update noar tt set x=x - -20 where id=5;
-update noar ti set x=x - -20 where id=5;
+update tt set x=x - -20 where id=5;
+update ti set x=x - -20 where id=5;
 Warnings:
 Warning	1264	Out of range value for column 'x' at row 1
 include/diff_tables.inc [test.tt, test.ti]
 insert into tt values (6,-pow(2,31)+10);
 insert into ti values (6,-pow(2,31)+10);
-update noar tt set x=x-20 where id=6;
-update noar ti set x=x-20 where id=6;
+update tt set x=x-20 where id=6;
+update ti set x=x-20 where id=6;
 Warnings:
 Warning	1264	Out of range value for column 'x' at row 1
 include/diff_tables.inc [test.tt, test.ti]
 insert into tt values (7,-pow(2,31)+10);
 insert into ti values (7,-pow(2,31)+10);
-update noar tt set x=x + -20 where id=7;
-update noar ti set x=x + -20 where id=7;
+update tt set x=x + -20 where id=7;
+update ti set x=x + -20 where id=7;
 Warnings:
 Warning	1264	Out of range value for column 'x' at row 1
 include/diff_tables.inc [test.tt, test.ti]