refs #5725 get upsert tests running on mysql and mariadb

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

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

@@ -3,13 +3,13 @@ set session tokudb_enable_fast_upsert=1;
 set session tokudb_disable_slow_upsert=1;
 insert into tt values (1,0);
 insert 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 MariaDB version
+ERROR 42000: Table 'tt' uses an extension that doesn't exist in this XYZ version
 insert 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 MariaDB version
+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 tt set x=x+1 where id=1;
-ERROR 42000: Table 'tt' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 'tt' uses an extension that doesn't exist in this XYZ version
 update tt set x=x+1 where id=2;
-ERROR 42000: Table 'tt' uses an extension that doesn't exist in this MariaDB 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/r/tokudb_binlog_row.result

@@ -3,13 +3,13 @@ set session tokudb_enable_fast_upsert=1;
 set session tokudb_disable_slow_upsert=1;
 insert into tt values (1,0);
 insert 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 MariaDB version
+ERROR 42000: Table 'tt' uses an extension that doesn't exist in this XYZ version
 insert 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 MariaDB version
+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 tt set x=x+1 where id=1;
-ERROR 42000: Table 'tt' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 'tt' uses an extension that doesn't exist in this XYZ version
 update tt set x=x+1 where id=2;
-ERROR 42000: Table 'tt' uses an extension that doesn't exist in this MariaDB 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/r/tokudb_binlog_statement.result

@@ -3,13 +3,13 @@ set session tokudb_enable_fast_upsert=1;
 set session tokudb_disable_slow_upsert=1;
 insert into tt values (1,0);
 insert 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 MariaDB version
+ERROR 42000: Table 'tt' uses an extension that doesn't exist in this XYZ version
 insert 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 MariaDB version
+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 tt set x=x+1 where id=1;
-ERROR 42000: Table 'tt' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 'tt' uses an extension that doesn't exist in this XYZ version
 update tt set x=x+1 where id=2;
-ERROR 42000: Table 'tt' uses an extension that doesn't exist in this MariaDB 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_binlog_mixed.test

@@ -8,18 +8,22 @@ set session tokudb_disable_slow_upsert=1;
 
 insert into tt values (1,0);
 
+replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
 error ER_UNSUPPORTED_EXTENSION;
 insert into tt values (1,0) on duplicate key update x=x+1;
 
+replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
 error ER_UNSUPPORTED_EXTENSION;
 insert 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/;
 error ER_UNSUPPORTED_EXTENSION;
 update tt set x=x+1 where id=1;
 
+replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
 error ER_UNSUPPORTED_EXTENSION;
 update tt set x=x+1 where id=2;
 

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

@@ -8,18 +8,22 @@ set session tokudb_disable_slow_upsert=1;
 
 insert into tt values (1,0);
 
+replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
 error ER_UNSUPPORTED_EXTENSION;
 insert into tt values (1,0) on duplicate key update x=x+1;
 
+replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
 error ER_UNSUPPORTED_EXTENSION;
 insert 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/;
 error ER_UNSUPPORTED_EXTENSION;
 update tt set x=x+1 where id=1;
 
+replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
 error ER_UNSUPPORTED_EXTENSION;
 update tt set x=x+1 where id=2;
 

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

@@ -8,18 +8,22 @@ set session tokudb_disable_slow_upsert=1;
 
 insert into tt values (1,0);
 
+replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
 error ER_UNSUPPORTED_EXTENSION;
 insert into tt values (1,0) on duplicate key update x=x+1;
 
+replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
 error ER_UNSUPPORTED_EXTENSION;
 insert 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/;
 error ER_UNSUPPORTED_EXTENSION;
 update tt set x=x+1 where id=1;
 
+replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
 error ER_UNSUPPORTED_EXTENSION;
 update tt set x=x+1 where id=2;