diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-05-03 12:10:16 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-05-03 12:10:16 +0200 |
| commit | d0d05dae079554e1b7d4dd62ca8b364a8076510e (patch) | |
| tree | 57e89ca0480ac96947450dfc3f283753bd4c9034 /mysql-test/lib | |
| parent | 56d485e2b5d4bbc6ab20eb8e82197e9a557bb327 (diff) | |
| parent | 5aa0d185ca18cf538eea5c9c501e1e342b41b274 (diff) | |
| download | mariadb-git-d0d05dae079554e1b7d4dd62ca8b364a8076510e.tar.gz | |
Merge 10.0-base -> 10.0
Diffstat (limited to 'mysql-test/lib')
| -rw-r--r-- | mysql-test/lib/v1/mtr_report.pl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/lib/v1/mtr_report.pl b/mysql-test/lib/v1/mtr_report.pl index 7166eb523f2..accf00dbb5d 100644 --- a/mysql-test/lib/v1/mtr_report.pl +++ b/mysql-test/lib/v1/mtr_report.pl @@ -312,7 +312,7 @@ sub mtr_report_stats ($) { /Slave: The incident LOST_EVENTS occured on the master/ or /Slave: Unknown error.* 1105/ or /Slave: Can't drop database.* database doesn't exist/ or - /Slave SQL:.*(?:Error_code: \d+|Query:.*)/ or + /Slave SQL:.*(?:error.* \d+|Query:.*)/ or /Sort aborted/ or /Time-out in NDB/ or /One can only use the --user.*root/ or @@ -361,7 +361,7 @@ sub mtr_report_stats ($) { # rpl_extrColmaster_*.test, the slave thread produces warnings # when it get updates to a table that has more columns on the # master - /Slave: Unknown column 'c7' in 't15' Error_code: 1054/ or + /Slave: Unknown column 'c7' in 't15' error.* 1054/ or /Slave: Can't DROP 'c7'.* 1091/ or /Slave: Key column 'c6'.* 1072/ or @@ -370,8 +370,8 @@ sub mtr_report_stats ($) { # rpl_idempotency.test produces warnings for the slave. ($testname eq 'rpl.rpl_idempotency' and - (/Slave: Can\'t find record in \'t1\' Error_code: 1032/ or - /Slave: Cannot add or update a child row: a foreign key constraint fails .* Error_code: 1452/ + (/Slave: Can\'t find record in \'t1\' error.* 1032/ or + /Slave: Cannot add or update a child row: a foreign key constraint fails .* error.* 1452/ )) or # These tests does "kill" on queries, causing sporadic errors when writing to logs @@ -389,7 +389,7 @@ sub mtr_report_stats ($) { # rpl_temporary has an error on slave that can be ignored ($testname eq 'rpl.rpl_temporary' and - (/Slave: Can\'t find record in \'user\' Error_code: 1032/ + (/Slave: Can\'t find record in \'user\' error.* 1032/ )) or # Test case for Bug#31590 produces the following error: /Out of sort memory; increase server sort buffer size/ or |