1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed test failure seen on partition_innodb_plugin test case.

Browse Source
This commit is contained in:
Jan Lindström 2015-02-18 14:07:13 +02:00
parent 2fb81b956d
commit 865b83e9a4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/partition_innodb_plugin.result
View File

@ -141,12 +141,12 @@ ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
# First table reported in 'SHOW ENGINE InnoDB STATUS' # First table reported in 'SHOW ENGINE InnoDB STATUS'
SHOW ENGINE InnoDB STATUS; SHOW ENGINE InnoDB STATUS;
Type Name Status Type Name Status
InnoDB index `PRIMARY` of table `test`.`t``\""e` /* Partition `p0``\""e`, Subpartition `sp0``\""e` */ InnoDB index `PRIMARY` of table `test`.`t``\""e` /* Partition `p0``\""e`, Subpartition `sp0``\""e` */
set @old_sql_mode = @@sql_mode; set @old_sql_mode = @@sql_mode;
set sql_mode = 'ANSI_QUOTES'; set sql_mode = 'ANSI_QUOTES';
SHOW ENGINE InnoDB STATUS; SHOW ENGINE InnoDB STATUS;
Type Name Status Type Name Status
InnoDB index `PRIMARY` of table `test`.`t``\""e` /* Partition `p0``\""e`, Subpartition `sp0``\""e` */ InnoDB index `PRIMARY` of table `test`.`t``\""e` /* Partition `p0``\""e`, Subpartition `sp0``\""e` */
set @@sql_mode = @old_sql_mode; set @@sql_mode = @old_sql_mode;
# con1 # con1
ROLLBACK; ROLLBACK;

4
mysql-test/t/partition_innodb_plugin.test
View File

@ -149,11 +149,11 @@ UPDATE `t``\""e` SET a = 4 WHERE a = 22;
# NOTE: replace_regex is very slow on match copy/past '(.*)' regex's # NOTE: replace_regex is very slow on match copy/past '(.*)' regex's
# on big texts, removing a lot of text before + after makes it much faster. # on big texts, removing a lot of text before + after makes it much faster.
#/.*in (.*) trx.*/\1/ #/.*in (.*) trx.*/\1/
--replace_regex /.*RECORD LOCKS space id [0-9]* page no [0-9]* n bits [0-9]* // / trx id .*// /.*index .* in // --replace_regex /.*RECORD LOCKS space id [0-9]* page no [0-9]* n bits [0-9]* // / trx id .*// /.*index .* in // /trx table locks [0-9]* // /total table locks [0-9]* //
SHOW ENGINE InnoDB STATUS; SHOW ENGINE InnoDB STATUS;
set @old_sql_mode = @@sql_mode; set @old_sql_mode = @@sql_mode;
set sql_mode = 'ANSI_QUOTES'; set sql_mode = 'ANSI_QUOTES';
--replace_regex /.*RECORD LOCKS space id [0-9]* page no [0-9]* n bits [0-9]* // / trx id .*// /.*index .* in // --replace_regex /.*RECORD LOCKS space id [0-9]* page no [0-9]* n bits [0-9]* // / trx id .*// /.*index .* in // /trx table locks [0-9]* // /total table locks [0-9]* //
SHOW ENGINE InnoDB STATUS; SHOW ENGINE InnoDB STATUS;
set @@sql_mode = @old_sql_mode; set @@sql_mode = @old_sql_mode;
--echo # con1 --echo # con1