diff options
| author | tsmith@sita.local <> | 2007-07-09 03:27:03 -0600 |
|---|---|---|
| committer | tsmith@sita.local <> | 2007-07-09 03:27:03 -0600 |
| commit | 5f12f35c3424127f8b80c6b6ecc658c24650ea8e (patch) | |
| tree | a96c6f8f663f3241acd88553098532553c33ed17 /mysql-test/lib | |
| parent | b37c24c439282ed2497534b1515cde1fdf32057e (diff) | |
| parent | eac626bde6dfa170254290d2fb0c73f9dd49d06d (diff) | |
| download | mariadb-git-5f12f35c3424127f8b80c6b6ecc658c24650ea8e.tar.gz | |
Merge sita.local:/Users/tsmith/m/bk/51
into sita.local:/Users/tsmith/m/bk/maint/51
This merge requires a post-merge fix to remove rpl_udf from
suite/rpl/t/disabled.def.
Diffstat (limited to 'mysql-test/lib')
| -rw-r--r-- | mysql-test/lib/mtr_report.pl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl index e0287d84c0e..317b5b8ba8e 100644 --- a/mysql-test/lib/mtr_report.pl +++ b/mysql-test/lib/mtr_report.pl @@ -345,6 +345,10 @@ sub mtr_report_stats ($) { /skip-name-resolve mode/ or /slave SQL thread aborted/ 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: # Bug #28436: Incorrect position in SHOW BINLOG EVENTS causes # server coredump |