diff --git a/mysql-test/suite/tokudb.fast_update/r/tokudb_binlog_mixed.result b/mysql-test/suite/tokudb.fast_update/r/tokudb_binlog_mixed.result index b4d6015b5e2..10ac5e5d2b4 100644 --- a/mysql-test/suite/tokudb.fast_update/r/tokudb_binlog_mixed.result +++ b/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; diff --git a/mysql-test/suite/tokudb.fast_update/r/tokudb_binlog_row.result b/mysql-test/suite/tokudb.fast_update/r/tokudb_binlog_row.result index b4d6015b5e2..10ac5e5d2b4 100644 --- a/mysql-test/suite/tokudb.fast_update/r/tokudb_binlog_row.result +++ b/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; diff --git a/mysql-test/suite/tokudb.fast_update/r/tokudb_binlog_statement.result b/mysql-test/suite/tokudb.fast_update/r/tokudb_binlog_statement.result index b4d6015b5e2..10ac5e5d2b4 100644 --- a/mysql-test/suite/tokudb.fast_update/r/tokudb_binlog_statement.result +++ b/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; diff --git a/mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_mixed.test b/mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_mixed.test index 948a76e0ff7..eeb6f055e6a 100644 --- a/mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_mixed.test +++ b/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; diff --git a/mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_row.test b/mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_row.test index 34cd8c7c54a..f7aed08fb0c 100644 --- a/mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_row.test +++ b/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; diff --git a/mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_statement.test b/mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_statement.test index 48c31f4110c..dd761f5835f 100644 --- a/mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_statement.test +++ b/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;