Skip to content

M
mariadb
Commit f6e34451 authored by Rich Prohaska's avatar Rich Prohaska
Browse files
Options

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
parent aad26e6b
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 12 deletions
mysql-test/suite/tokudb.fast_update/r/tokudb_binlog_mixed.result
View file @ f6e34451
...@@ -3,13 +3,13 @@ set session tokudb_enable_fast_upsert=1; ...@@ -3,13 +3,13 @@ set session tokudb_enable_fast_upsert=1;
set session tokudb_disable_slow_upsert=1; set session tokudb_disable_slow_upsert=1;
insert into tt values (1,0); insert into tt values (1,0);
insert into tt values (1,0) on duplicate key update x=x+1; 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; 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_enable_fast_update=1;
set session tokudb_disable_slow_update=1; set session tokudb_disable_slow_update=1;
update tt set x=x+1 where id=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; 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; drop table tt;
mysql-test/suite/tokudb.fast_update/r/tokudb_binlog_row.result
View file @ f6e34451
...@@ -3,13 +3,13 @@ set session tokudb_enable_fast_upsert=1; ...@@ -3,13 +3,13 @@ set session tokudb_enable_fast_upsert=1;
set session tokudb_disable_slow_upsert=1; set session tokudb_disable_slow_upsert=1;
insert into tt values (1,0); insert into tt values (1,0);
insert into tt values (1,0) on duplicate key update x=x+1; 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; 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_enable_fast_update=1;
set session tokudb_disable_slow_update=1; set session tokudb_disable_slow_update=1;
update tt set x=x+1 where id=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; 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; drop table tt;
mysql-test/suite/tokudb.fast_update/r/tokudb_binlog_statement.result
View file @ f6e34451
...@@ -3,13 +3,13 @@ set session tokudb_enable_fast_upsert=1; ...@@ -3,13 +3,13 @@ set session tokudb_enable_fast_upsert=1;
set session tokudb_disable_slow_upsert=1; set session tokudb_disable_slow_upsert=1;
insert into tt values (1,0); insert into tt values (1,0);
insert into tt values (1,0) on duplicate key update x=x+1; 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; 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_enable_fast_update=1;
set session tokudb_disable_slow_update=1; set session tokudb_disable_slow_update=1;
update tt set x=x+1 where id=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; 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; drop table tt;
mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_mixed.test
View file @ f6e34451
...@@ -8,18 +8,22 @@ set session tokudb_disable_slow_upsert=1; ...@@ -8,18 +8,22 @@ set session tokudb_disable_slow_upsert=1;
insert into tt values (1,0); insert into tt values (1,0);
replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
error ER_UNSUPPORTED_EXTENSION; error ER_UNSUPPORTED_EXTENSION;
insert into tt values (1,0) on duplicate key update x=x+1; insert into tt values (1,0) on duplicate key update x=x+1;
replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
error ER_UNSUPPORTED_EXTENSION; error ER_UNSUPPORTED_EXTENSION;
insert into tt values (2,0) on duplicate key update x=x+1; insert into tt values (2,0) on duplicate key update x=x+1;
set session tokudb_enable_fast_update=1; set session tokudb_enable_fast_update=1;
set session tokudb_disable_slow_update=1; set session tokudb_disable_slow_update=1;
replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
error ER_UNSUPPORTED_EXTENSION; error ER_UNSUPPORTED_EXTENSION;
update tt set x=x+1 where id=1; update tt set x=x+1 where id=1;
replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
error ER_UNSUPPORTED_EXTENSION; error ER_UNSUPPORTED_EXTENSION;
update tt set x=x+1 where id=2; update tt set x=x+1 where id=2;
......
mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_row.test
View file @ f6e34451
...@@ -8,18 +8,22 @@ set session tokudb_disable_slow_upsert=1; ...@@ -8,18 +8,22 @@ set session tokudb_disable_slow_upsert=1;
insert into tt values (1,0); insert into tt values (1,0);
replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
error ER_UNSUPPORTED_EXTENSION; error ER_UNSUPPORTED_EXTENSION;
insert into tt values (1,0) on duplicate key update x=x+1; insert into tt values (1,0) on duplicate key update x=x+1;
replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
error ER_UNSUPPORTED_EXTENSION; error ER_UNSUPPORTED_EXTENSION;
insert into tt values (2,0) on duplicate key update x=x+1; insert into tt values (2,0) on duplicate key update x=x+1;
set session tokudb_enable_fast_update=1; set session tokudb_enable_fast_update=1;
set session tokudb_disable_slow_update=1; set session tokudb_disable_slow_update=1;
replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
error ER_UNSUPPORTED_EXTENSION; error ER_UNSUPPORTED_EXTENSION;
update tt set x=x+1 where id=1; update tt set x=x+1 where id=1;
replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
error ER_UNSUPPORTED_EXTENSION; error ER_UNSUPPORTED_EXTENSION;
update tt set x=x+1 where id=2; update tt set x=x+1 where id=2;
......
mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_statement.test
View file @ f6e34451
...@@ -8,18 +8,22 @@ set session tokudb_disable_slow_upsert=1; ...@@ -8,18 +8,22 @@ set session tokudb_disable_slow_upsert=1;
insert into tt values (1,0); insert into tt values (1,0);
replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
error ER_UNSUPPORTED_EXTENSION; error ER_UNSUPPORTED_EXTENSION;
insert into tt values (1,0) on duplicate key update x=x+1; insert into tt values (1,0) on duplicate key update x=x+1;
replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
error ER_UNSUPPORTED_EXTENSION; error ER_UNSUPPORTED_EXTENSION;
insert into tt values (2,0) on duplicate key update x=x+1; insert into tt values (2,0) on duplicate key update x=x+1;
set session tokudb_enable_fast_update=1; set session tokudb_enable_fast_update=1;
set session tokudb_disable_slow_update=1; set session tokudb_disable_slow_update=1;
replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
error ER_UNSUPPORTED_EXTENSION; error ER_UNSUPPORTED_EXTENSION;
update tt set x=x+1 where id=1; update tt set x=x+1 where id=1;
replace_regex /MariaDB/XYZ/ /MySQL/XYZ/;
error ER_UNSUPPORTED_EXTENSION; error ER_UNSUPPORTED_EXTENSION;
update tt set x=x+1 where id=2; update tt set x=x+1 where id=2;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7