summaryrefslogtreecommitdiff
path: root/mysql-test/t/partition_innodb_plugin.test
diff options
context:
space:
mode:
authorJan Lindström <jplindst@mariadb.org>2015-02-18 14:07:13 +0200
committerJan Lindström <jplindst@mariadb.org>2015-02-18 14:07:13 +0200
commit865b83e9a4b834b1f58e60db4709031bef823f4a (patch)
tree4a9410718b9d937e769567f94a2c3a96e137a018 /mysql-test/t/partition_innodb_plugin.test
parent2fb81b956d82400a66f2875e6b885b45192fffcd (diff)
downloadmariadb-git-865b83e9a4b834b1f58e60db4709031bef823f4a.tar.gz
Fixed test failure seen on partition_innodb_plugin test case.
Diffstat (limited to 'mysql-test/t/partition_innodb_plugin.test')
-rw-r--r--mysql-test/t/partition_innodb_plugin.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/partition_innodb_plugin.test b/mysql-test/t/partition_innodb_plugin.test
index 8044ae9ec5c..fd6e60c27fb 100644
--- a/mysql-test/t/partition_innodb_plugin.test
+++ b/mysql-test/t/partition_innodb_plugin.test
@@ -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
# on big texts, removing a lot of text before + after makes it much faster.
#/.*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;
set @old_sql_mode = @@sql_mode;
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;
set @@sql_mode = @old_sql_mode;
--echo # con1