refs #5725 remove the tokudb_enable_fast_update/upsert variable

git-svn-id: file:///svn/mysql/tests/mysql-test@52230 c7de825b-a66e-492c-adef-691d508d4ae1

mysql-test/suite/tokudb.fast_update/r/tokudb_binlog_row.result

 set default_storage_engine='tokudb';
 create table tt (id int primary key, x int);
-set session tokudb_enable_fast_upsert=1;
 set session tokudb_disable_slow_upsert=1;
 insert noar into tt values (1,0);
 insert noar into tt values (1,0) on duplicate key update x=x+1;
 ERROR 42000: Table 'tt' uses an extension that doesn't exist in this XYZ version
 insert noar into tt values (2,0) on duplicate key update x=x+1;
 ERROR 42000: Table 'tt' uses an extension that doesn't exist in this XYZ version
-set session tokudb_enable_fast_update=1;
 set session tokudb_disable_slow_update=1;
 update noar tt set x=x+1 where id=1;
 ERROR 42000: Table 'tt' uses an extension that doesn't exist in this XYZ version

mysql-test/suite/tokudb.fast_update/r/tokudb_disable_slow_update.result

 set default_storage_engine='tokudb';
 drop table if exists t;
 create table t (id int primary key, b int, key(b));
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set b=b+1 where id=42;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version

mysql-test/suite/tokudb.fast_update/r/tokudb_fast_update_char.result

 set default_storage_engine='tokudb';
 drop table if exists tt, ti;
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 create table tt (id int primary key, c char(32), b binary(32));
 create table ti like tt;

mysql-test/suite/tokudb.fast_update/r/tokudb_fast_update_error.result

 set default_storage_engine='tokudb';
 drop table if exists tt;
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 create table tt (id int primary key, x int);
 update noar tt set x=1 where id='abc';

mysql-test/suite/tokudb.fast_update/r/tokudb_fast_update_int.result

@@ -10,7 +10,6 @@ id	x
 1	0
 2	0
 3	0
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -67,7 +66,6 @@ id	x
 1	0
 2	0
 3	0
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -124,7 +122,6 @@ id	x
 1	0
 2	0
 3	0
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -181,7 +178,6 @@ id	x
 1	0
 2	0
 3	0
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -238,7 +234,6 @@ id	x
 1	0
 2	0
 3	0
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -295,7 +290,6 @@ id	x
 1	0
 2	0
 3	0
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -352,7 +346,6 @@ id	x
 1	0
 2	0
 3	0
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -409,7 +402,6 @@ id	x
 1	0
 2	0
 3	0
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -466,7 +458,6 @@ id	x
 1	0
 2	0
 3	0
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -523,7 +514,6 @@ id	x
 1	0
 2	0
 3	0
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -580,7 +570,6 @@ id	x
 1	0
 2	0
 3	0
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -637,7 +626,6 @@ id	x
 1	0
 2	0
 3	0
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -694,7 +682,6 @@ id	x
 1	0
 2	0
 3	0
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -751,7 +738,6 @@ id	x
 1	0
 2	0
 3	0
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -808,7 +794,6 @@ id	x
 1	0
 2	0
 3	0
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -865,7 +850,6 @@ id	x
 1	0
 2	0
 3	0
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -922,7 +906,6 @@ id	x
 1	0
 2	0
 3	0
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -979,7 +962,6 @@ id	x
 1	0
 2	0
 3	0
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -1036,7 +1018,6 @@ id	x
 1	0
 2	0
 3	0
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -1093,7 +1074,6 @@ id	x
 1	0
 2	0
 3	0
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;

mysql-test/suite/tokudb.fast_update/r/tokudb_fast_update_int_bounds.result

@@ -5,7 +5,6 @@ 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_enable_fast_update=1;
 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;

mysql-test/suite/tokudb.fast_update/r/tokudb_fast_update_sqlmode.result

 set default_storage_engine='tokudb';
 drop table if exists t;
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 create table t (id int primary key, x int not null);
 insert into t values (1,0);

mysql-test/suite/tokudb.fast_update/r/tokudb_fast_update_uint_bounds.result

@@ -5,7 +5,6 @@ insert into tt values (1,0),(2,pow(2,32)-1);
 create table ti like tt;
 alter table ti engine=innodb;
 insert into ti select * from tt;
-set tokudb_enable_fast_update=1;
 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;

mysql-test/suite/tokudb.fast_update/r/tokudb_update_deadlock.result

@@ -2,10 +2,8 @@ drop table if exists t;
 set default_storage_engine='tokudb';
 create table t (id bigint primary key, b bigint not null default 0);
 insert into t (id) values (1),(2);
-set session tokudb_enable_fast_update=1;
 begin;
 update noar t set b=b+1 where id=1;
-set session tokudb_enable_fast_update=1;
 begin;
 update noar t set b=b-1 where id=2;
 update noar t set b=b+1 where id=2;

mysql-test/suite/tokudb.fast_update/r/tokudb_update_decr_floor.result

 set default_storage_engine='tokudb';
 drop table if exists t;
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 create table tt (
 id tinyint  null primary key,

mysql-test/suite/tokudb.fast_update/r/tokudb_update_key.result

 set default_storage_engine='tokudb';
 drop table if exists t;
-set tokudb_enable_fast_update=1;
 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;

mysql-test/suite/tokudb.fast_update/r/tokudb_upsert_char.result

 set default_storage_engine='tokudb';
 drop table if exists tt, ti;
-set tokudb_enable_fast_upsert=1;
 set tokudb_disable_slow_upsert=1;
 create table tt (id int primary key, c char(32), b binary(32));
 create table ti like tt;

mysql-test/suite/tokudb.fast_update/r/tokudb_upsert_deadlock.result

 drop table if exists t;
 set default_storage_engine='tokudb';
 create table t (id bigint primary key, b bigint not null default 0);
-set session tokudb_enable_fast_upsert=1;
 begin;
 insert noar into t (id) values (1) on duplicate key update b=b+1;
-set session tokudb_enable_fast_upsert=1;
 begin;
 insert noar into t (id) values (2) on duplicate key update b=b-1;
 insert noar into t (id) values (2) on duplicate key update b=b+1;

mysql-test/suite/tokudb.fast_update/r/tokudb_upsert_int.result

 set default_storage_engine='tokudb';
 drop table if exists tt, ti;
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 create table tt (
 id tinyint  null primary key,

mysql-test/suite/tokudb.fast_update/r/tokudb_upsert_key.result

 set default_storage_engine='tokudb';
 drop table if exists t;
-set tokudb_enable_fast_upsert=1;
 set tokudb_disable_slow_upsert=1;
 create table t (a int, b char(32), c varchar(32), d blob);
 insert noar into t values (1,null,null,null) on duplicate key update a=42;

mysql-test/suite/tokudb.fast_update/r/tokudb_upsert_sqlmode.result

 set default_storage_engine='tokudb';
 drop table if exists t;
-set tokudb_enable_fast_upsert=1;
 set tokudb_disable_slow_upsert=1;
 create table t (id int primary key, x int not null);
 insert noar into t values (1,0);

mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_mixed.test

+source include/master-slave.inc;
 source include/have_binlog_format_mixed.inc;
 source include/have_tokudb.inc;
 
 set default_storage_engine='tokudb';
 create table tt (id int primary key, x int);
 
-set session tokudb_enable_fast_upsert=1;
 set session tokudb_disable_slow_upsert=1;
 
-insert noar into tt values (1,0);
+connection master;
+show variables like 'binlog_format';
+show variables like 'server_id';
 
-replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
-error ER_UNSUPPORTED_EXTENSION;
-insert noar into tt values (1,0) on duplicate key update x=x+1;
+connection slave;
+show variables like 'binlog_format';
+show variables like 'server_id';
 
-replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
-error ER_UNSUPPORTED_EXTENSION;
-insert noar into tt values (2,0) on duplicate key update x=x+1;
+connection master;
 
-set session tokudb_enable_fast_update=1;
-set session tokudb_disable_slow_update=1;
+let $n=100;
 
-replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
-error ER_UNSUPPORTED_EXTENSION;
-update noar tt set x=x+1 where id=1;
+# insert a bunch of new rows
+let $i=0;
+while ($i < $n) {
+        eval insert into tt values ($i,0) on duplicate key update x=x+1;
+        inc $i;
+}
 
-replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
-error ER_UNSUPPORTED_EXTENSION;
-update noar tt set x=x+1 where id=2;
+# upsert a bunch of rows
+let $i=0;
+while ($i < $n) {
+        eval insert into tt values ($i,0) on duplicate key update x=x+1;
+        inc $i;
+}
 
+# update a bunch of rows
+let $i=0;
+while ($i < $n) {
+        eval update noar tt set x=x+1 where id=$i;
+        inc $i;
+}
+select * from tt where x != 2;
+
+sync_slave_with_master;
+
+let $diff_tables= master:test.tt, slave:test.tt;
+source include/diff_tables.inc;
+
+connection master;
 drop table tt;
+
+source include/rpl_end.inc;
+

mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_row.test

@@ -4,7 +4,6 @@ source include/have_tokudb.inc;
 set default_storage_engine='tokudb';
 create table tt (id int primary key, x int);
 
-set session tokudb_enable_fast_upsert=1;
 set session tokudb_disable_slow_upsert=1;
 
 insert noar into tt values (1,0);
@@ -17,7 +16,6 @@ replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
 error ER_UNSUPPORTED_EXTENSION;
 insert noar into tt values (2,0) on duplicate key update x=x+1;
 
-set session tokudb_enable_fast_update=1;
 set session tokudb_disable_slow_update=1;
 
 replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;

mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_statement.test

+source include/master-slave.inc;
 source include/have_binlog_format_statement.inc;
 source include/have_tokudb.inc;
 
 set default_storage_engine='tokudb';
 create table tt (id int primary key, x int);
 
-set session tokudb_enable_fast_upsert=1;
 set session tokudb_disable_slow_upsert=1;
 
-insert noar into tt values (1,0);
+connection master;
+show variables like 'binlog_format';
+show variables like 'server_id';
 
-replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
-error ER_UNSUPPORTED_EXTENSION;
-insert noar into tt values (1,0) on duplicate key update x=x+1;
+connection slave;
+show variables like 'binlog_format';
+show variables like 'server_id';
 
-replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
-error ER_UNSUPPORTED_EXTENSION;
-insert noar into tt values (2,0) on duplicate key update x=x+1;
+connection master;
 
-set session tokudb_enable_fast_update=1;
-set session tokudb_disable_slow_update=1;
+let $n=100;
 
-replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
-error ER_UNSUPPORTED_EXTENSION;
-update noar tt set x=x+1 where id=1;
+# insert a bunch of new rows
+let $i=0;
+while ($i < $n) {
+        eval insert into tt values ($i,0) on duplicate key update x=x+1;
+        inc $i;
+}
 
-replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
-error ER_UNSUPPORTED_EXTENSION;
-update noar tt set x=x+1 where id=2;
+# upsert a bunch of rows
+let $i=0;
+while ($i < $n) {
+        eval insert into tt values ($i,0) on duplicate key update x=x+1;
+        inc $i;
+}
 
+# update a bunch of rows
+let $i=0;
+while ($i < $n) {
+        eval update noar tt set x=x+1 where id=$i;
+        inc $i;
+}
+select * from tt where x != 2;
+
+sync_slave_with_master;
+
+let $diff_tables= master:test.tt, slave:test.tt;
+source include/diff_tables.inc;
+
+connection master;
 drop table tt;
+
+source include/rpl_end.inc;
+

mysql-test/suite/tokudb.fast_update/t/tokudb_disable_slow_update.test

@@ -8,7 +8,6 @@ drop table if exists t;
 
 create table t (id int primary key, b int, key(b));
 
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 
 replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;

mysql-test/suite/tokudb.fast_update/t/tokudb_fast_update_char.test

@@ -10,7 +10,6 @@ disable_warnings;
 drop table if exists tt, ti;
 enable_warnings;
 
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 
 create table tt (id int primary key, c char(32), b binary(32));

mysql-test/suite/tokudb.fast_update/t/tokudb_fast_update_error.test

@@ -9,7 +9,6 @@ disable_warnings;
 drop table if exists tt;
 enable_warnings;
 
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 
 create table tt (id int primary key, x int);

mysql-test/suite/tokudb.fast_update/t/tokudb_fast_update_int.py

@@ -26,7 +26,6 @@ def test_int(t, u, n):
     print "insert into t values (1,0),(2,0),(3,0);"
     print "select * from t;"
 
-    print "set tokudb_enable_fast_update=1;"
     print "set tokudb_disable_slow_update=1;"
 
     # set is fast

mysql-test/suite/tokudb.fast_update/t/tokudb_fast_update_int.test

@@ -11,7 +11,6 @@ create table t (
 );
 insert into t values (1,0),(2,0),(3,0);
 select * from t;
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -44,7 +43,6 @@ create table t (
 );
 insert into t values (1,0),(2,0),(3,0);
 select * from t;
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -77,7 +75,6 @@ create table t (
 );
 insert into t values (1,0),(2,0),(3,0);
 select * from t;
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -110,7 +107,6 @@ create table t (
 );
 insert into t values (1,0),(2,0),(3,0);
 select * from t;
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -143,7 +139,6 @@ create table t (
 );
 insert into t values (1,0),(2,0),(3,0);
 select * from t;
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -176,7 +171,6 @@ create table t (
 );
 insert into t values (1,0),(2,0),(3,0);
 select * from t;
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -209,7 +203,6 @@ create table t (
 );
 insert into t values (1,0),(2,0),(3,0);
 select * from t;
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -242,7 +235,6 @@ create table t (
 );
 insert into t values (1,0),(2,0),(3,0);
 select * from t;
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -275,7 +267,6 @@ create table t (
 );
 insert into t values (1,0),(2,0),(3,0);
 select * from t;
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -308,7 +299,6 @@ create table t (
 );
 insert into t values (1,0),(2,0),(3,0);
 select * from t;
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -341,7 +331,6 @@ create table t (
 );
 insert into t values (1,0),(2,0),(3,0);
 select * from t;
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -374,7 +363,6 @@ create table t (
 );
 insert into t values (1,0),(2,0),(3,0);
 select * from t;
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -407,7 +395,6 @@ create table t (
 );
 insert into t values (1,0),(2,0),(3,0);
 select * from t;
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -440,7 +427,6 @@ create table t (
 );
 insert into t values (1,0),(2,0),(3,0);
 select * from t;
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -473,7 +459,6 @@ create table t (
 );
 insert into t values (1,0),(2,0),(3,0);
 select * from t;
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -506,7 +491,6 @@ create table t (
 );
 insert into t values (1,0),(2,0),(3,0);
 select * from t;
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -539,7 +523,6 @@ create table t (
 );
 insert into t values (1,0),(2,0),(3,0);
 select * from t;
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -572,7 +555,6 @@ create table t (
 );
 insert into t values (1,0),(2,0),(3,0);
 select * from t;
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -605,7 +587,6 @@ create table t (
 );
 insert into t values (1,0),(2,0),(3,0);
 select * from t;
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;
@@ -638,7 +619,6 @@ create table t (
 );
 insert into t values (1,0),(2,0),(3,0);
 select * from t;
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 update noar t set x=100 where id=2;
 select * from t;

mysql-test/suite/tokudb.fast_update/t/tokudb_fast_update_int_bounds.test

@@ -13,7 +13,6 @@ create table ti like tt;
 alter table ti engine=innodb;
 insert into ti select * from tt;
 
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 
 update noar tt set x=x+1 where id=1;

mysql-test/suite/tokudb.fast_update/t/tokudb_fast_update_sqlmode.test

@@ -6,7 +6,6 @@ disable_warnings;
 drop table if exists t;
 enable_warnings;
 
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 
 let $default_sql_mode = `select @@session.sql_mode`;

mysql-test/suite/tokudb.fast_update/t/tokudb_fast_update_uint_bounds.test

@@ -13,7 +13,6 @@ create table ti like tt;
 alter table ti engine=innodb;
 insert into ti select * from tt;
 
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 
 update noar tt set x=x+1 where id=1;

mysql-test/suite/tokudb.fast_update/t/tokudb_update_deadlock.test

@@ -12,12 +12,10 @@ insert into t (id) values (1),(2);
 connect (conn1,localhost,root,,);
 
 connection default;
-set session tokudb_enable_fast_update=1;
 begin;
 update noar t set b=b+1 where id=1;
 
 connection conn1;
-set session tokudb_enable_fast_update=1;
 begin;
 update noar t set b=b-1 where id=2;
 

mysql-test/suite/tokudb.fast_update/t/tokudb_update_decr_floor.py

@@ -11,7 +11,6 @@ def main():
     print "drop table if exists t;"
     print "enable_warnings;"
 
-    print "set tokudb_enable_fast_update=1;"
     print "set tokudb_disable_slow_update=1;"
 
     for t in [ 'tinyint', 'smallint', 'mediumint', 'int', 'bigint' ]:

mysql-test/suite/tokudb.fast_update/t/tokudb_update_decr_floor.test

@@ -5,7 +5,6 @@ set default_storage_engine='tokudb';
 disable_warnings;
 drop table if exists t;
 enable_warnings;
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 create table tt (
     id tinyint  null primary key,

mysql-test/suite/tokudb.fast_update/t/tokudb_update_key.test

@@ -6,7 +6,6 @@ disable_warnings;
 drop table if exists t;
 enable_warnings;
 
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 
 # must have primary key

mysql-test/suite/tokudb.fast_update/t/tokudb_upsert_bin_pad.test

@@ -6,7 +6,6 @@ disable_warnings;
 drop table if exists t0, t1;
 enable_warnings;
 
-set tokudb_enable_fast_upsert=1;
 set tokudb_disable_slow_upsert=1;
 
 create table t0 (id int primary key, b binary(32));

mysql-test/suite/tokudb.fast_update/t/tokudb_upsert_char.test

@@ -7,7 +7,6 @@ disable_warnings;
 drop table if exists tt, ti;
 enable_warnings;
 
-set tokudb_enable_fast_upsert=1;
 set tokudb_disable_slow_upsert=1;
 
 create table tt (id int primary key, c char(32), b binary(32));

mysql-test/suite/tokudb.fast_update/t/tokudb_upsert_deadlock.test

@@ -11,12 +11,10 @@ create table t (id bigint primary key, b bigint not null default 0);
 connect (conn1,localhost,root,,);
 
 connection default;
-set session tokudb_enable_fast_upsert=1;
 begin;
 insert noar into t (id) values (1) on duplicate key update b=b+1;
 
 connection conn1;
-set session tokudb_enable_fast_upsert=1;
 begin;
 insert noar into t (id) values (2) on duplicate key update b=b-1;
 

mysql-test/suite/tokudb.fast_update/t/tokudb_upsert_int.py

@@ -11,7 +11,6 @@ def main():
     print "drop table if exists tt, ti;"
     print "enable_warnings;"
 
-    print "set tokudb_enable_fast_update=1;"
     print "set tokudb_disable_slow_update=1;"
 
     for t in [ 'tinyint', 'smallint', 'mediumint', 'int', 'bigint' ]:

mysql-test/suite/tokudb.fast_update/t/tokudb_upsert_int.test

@@ -5,7 +5,6 @@ set default_storage_engine='tokudb';
 disable_warnings;
 drop table if exists tt, ti;
 enable_warnings;
-set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 create table tt (
     id tinyint  null primary key,

mysql-test/suite/tokudb.fast_update/t/tokudb_upsert_key.test

@@ -6,7 +6,6 @@ disable_warnings;
 drop table if exists t;
 enable_warnings;
 
-set tokudb_enable_fast_upsert=1;
 set tokudb_disable_slow_upsert=1;
 
 # must have primary key

mysql-test/suite/tokudb.fast_update/t/tokudb_upsert_sqlmode.test

@@ -6,7 +6,6 @@ disable_warnings;
 drop table if exists t;
 enable_warnings;
 
-set tokudb_enable_fast_upsert=1;
 set tokudb_disable_slow_upsert=1;
 
 let $default_sql_mode = `select @@session.sql_mode`;