Skip to content

M
mariadb
Commit 836fe1e3 authored by istruewing@chilla.local's avatar istruewing@chilla.local
Browse files
Options

Merge chilla.local:/home/mydev/mysql-5.1-amain 

into  chilla.local:/home/mydev/mysql-5.1-axmrg
parents 7621de23 020eedd4
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
mysql-test/lib/mtr_report.pl
View file @ 836fe1e3
...@@ -359,6 +359,10 @@ sub mtr_report_stats ($) { ...@@ -359,6 +359,10 @@ sub mtr_report_stats ($) {
/skip-name-resolve mode/ or /skip-name-resolve mode/ or
/slave SQL thread aborted/ or /slave SQL thread aborted/ or
/Slave: .*Duplicate entry/ or /Slave: .*Duplicate entry/ or
# Special case for Bug #26402 in show_check.test
# Question marks are not valid file name parts
# on Windows platforms. Ignore this error message.
/\QCan't find file: '.\test\????????.frm'\E/ or
# Special case, made as specific as possible, for: # Special case, made as specific as possible, for:
# Bug #28436: Incorrect position in SHOW BINLOG EVENTS causes # Bug #28436: Incorrect position in SHOW BINLOG EVENTS causes
# server coredump # server coredump
......
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