refs #5640 port upsert tests to maria 5.5.28a

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

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

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

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

@@ -4,7 +4,7 @@ set tokudb_enable_fast_update=1;
 set tokudb_disable_slow_update=1;
 create table tt (id int primary key, x int);
 update tt set x=1 where id='abc';
-ERROR 42000: Table 'tt' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'tt' uses an extension that doesn't exist in this XYZ version
 update tt set x='abc' where id=1;
-ERROR 42000: Table 'tt' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'tt' uses an extension that doesn't exist in this XYZ version
 drop table tt;

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

@@ -11,6 +11,7 @@ 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/;
 --error ER_UNSUPPORTED_EXTENSION
 update t set b=b+1 where id=42;
 

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

@@ -2,6 +2,7 @@
 # test that char field primary keys are fast
 
 source include/have_tokudb.inc;
+source include/have_innodb.inc;
 
 set default_storage_engine='tokudb';
 

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

@@ -14,9 +14,11 @@ set tokudb_disable_slow_update=1;
 
 create table tt (id int primary key, x int);
 
+replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
 error ER_UNSUPPORTED_EXTENSION;
 update tt set x=1 where id='abc';
 
+replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
 error ER_UNSUPPORTED_EXTENSION;
 update tt set x='abc' where id=1;
 

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

@@ -5,6 +5,7 @@ import sys
 def main():
     print "# generated by tokudb_fast_update_int.py"
     print "source include/have_tokudb.inc;"
+    print "source include/have_innodb.inc;"
     print "set default_storage_engine='tokudb';"
     print "disable_warnings;"
     print "drop table if exists t;"

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

 # generated by tokudb_fast_update_int.py
 source include/have_tokudb.inc;
+source include/have_innodb.inc;
 set default_storage_engine='tokudb';
 disable_warnings;
 drop table if exists t;

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

---source include/have_tokudb.inc
+source include/have_tokudb.inc;
+source include/have_innodb.inc;
 
 set default_storage_engine='tokudb';
 

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

---source include/have_tokudb.inc
+source include/have_tokudb.inc;
+source include/have_innodb.inc;
 
 set default_storage_engine='tokudb';
 

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

@@ -5,6 +5,7 @@ import sys
 def main():
     print "# generated by tokudb_update_decr_floor.py"
     print "source include/have_tokudb.inc;"
+    print "source include/have_innodb.inc;"
     print "set default_storage_engine='tokudb';"
     print "disable_warnings;"
     print "drop table if exists t;"

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

 # generated by tokudb_update_decr_floor.py
 source include/have_tokudb.inc;
+source include/have_innodb.inc;
 set default_storage_engine='tokudb';
 disable_warnings;
 drop table if exists t;

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

 source include/have_tokudb.inc;
+source include/have_innodb.inc;
 
 set default_storage_engine='tokudb';
 

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

@@ -5,6 +5,7 @@ import sys
 def main():
     print "# generated by tokudb_upsert_int.py"
     print "source include/have_tokudb.inc;"
+    print "source include/have_innodb.inc;"
     print "set default_storage_engine='tokudb';"
     print "disable_warnings;"
     print "drop table if exists tt, ti;"

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

 # generated by tokudb_upsert_int.py
 source include/have_tokudb.inc;
+source include/have_innodb.inc;
 set default_storage_engine='tokudb';
 disable_warnings;
 drop table if exists tt, ti;