diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-04-16 09:42:09 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-04-16 09:42:09 +0200 |
| commit | 58a77aafab52bfc3d25bfd7680f8c27ca031e403 (patch) | |
| tree | 13010dd9b769158f817e32727d647b13fc90dc8a /mysql-test/mysql-test-run.pl | |
| parent | fc17efc29714b73a7b0bf806a354fa6fb294b35b (diff) | |
| download | mariadb-git-58a77aafab52bfc3d25bfd7680f8c27ca031e403.tar.gz | |
MDEV-3882: .deb versions lower than upstream repo, causing install failure
The official Debian Wheezy MySQL packages have versions like 5.5.30+dfsg-xxx.
Such version is larger than 5.5.30-yyy, so apt prefers it.
So use instead 5.5.30+maria-yyy, which is larger and can be pulled in
automatically by apt.
Also included are a couple of fixes for test failures in buildbot.
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 1001769e4e2..67f3a3163d8 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -4772,6 +4772,9 @@ sub extract_warning_lines ($$) { qr|Warning: io_setup\(\) failed|, qr|Warning: io_setup\(\) attempt|, qr|setrlimit could not change the size of core files to 'infinity';|, + qr|feedback plugin: failed to retrieve the MAC address|, + qr|Plugin 'FEEDBACK' init function returned error|, + qr|Plugin 'FEEDBACK' registration as a INFORMATION SCHEMA failed|, ); my $matched_lines= []; |