mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refs #5725 get upsert tests running on mysql and mariadb

Browse source 
git-svn-id: file:///svn/mysql/tests/mysql-test@51165 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Rich Prohaska 2012-12-14 12:04:12 +00:00
parent f77e963aa9
commit edb34cfce0
6 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mysql-test/suite/tokudb.fast_update/r/tokudb_binlog_mixed.result
View file

@ -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;

8
mysql-test/suite/tokudb.fast_update/r/tokudb_binlog_row.result
View file

@ -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;

8
mysql-test/suite/tokudb.fast_update/r/tokudb_binlog_statement.result
View file

@ -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;

4
mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_mixed.test
View file

@ -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;

4
mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_row.test
View file

@ -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;

4
mysql-test/suite/tokudb.fast_update/t/tokudb_binlog_statement.test
View file

@ -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;