From e9b1460d6c129305a95fba6c6e0682b6c05699e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Honza=20Hor=C3=A1k?= <hhorak@redhat.com>
Date: Mon, 4 Mar 2013 14:09:47 +0100
Subject: [PATCH] Mask expected warnings about setrlimit in test suite

---
 mariadb-warning.patch | 11 +++++++++++
 mariadb.spec          | 10 ++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 mariadb-warning.patch

diff --git a/mariadb-warning.patch b/mariadb-warning.patch
new file mode 100644
index 0000000..c98ee19
--- /dev/null
+++ b/mariadb-warning.patch
@@ -0,0 +1,11 @@
+diff -up mariadb-5.5.29/mysql-test/mysql-test-run.pl.warning mariadb-5.5.29/mysql-test/mysql-test-run.pl
+--- mariadb-5.5.29/mysql-test/mysql-test-run.pl.warning	2013-03-04 14:05:50.197960442 +0100
++++ mariadb-5.5.29/mysql-test/mysql-test-run.pl	2013-03-04 14:06:27.271959422 +0100
+@@ -4745,6 +4745,7 @@ sub extract_warning_lines ($$) {
+      qr|Error: io_setup\(\) failed|,
+      qr|Warning: io_setup\(\) failed|,
+      qr|Warning: io_setup\(\) attempt|,
++     qr|setrlimit could not change the size of core files to 'infinity';|,
+     );
+ 
+   my $matched_lines= [];
diff --git a/mariadb.spec b/mariadb.spec
index febdcb2..0ccc2f3 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -1,6 +1,6 @@
 Name: mariadb
 Version: 5.5.29
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 Summary: A community developed branch of MySQL
 Group: Applications/Databases
@@ -55,6 +55,7 @@ Patch13: mariadb-man-plugin.patch
 Patch14: mariadb-buffer.patch
 Patch15: mariadb-sortbuffer.patch
 Patch16: mariadb-basedir.patch
+Patch17: mariadb-warning.patch
 
 BuildRequires: perl, readline-devel, openssl-devel
 BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel
@@ -291,6 +292,7 @@ MariaDB is a community developed branch of MySQL.
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 # workaround for upstream bug #56342
 rm -f mysql-test/t/ssl_8k_key-master.opt
@@ -405,9 +407,6 @@ done
     cd mysql-test
     perl ./mysql-test-run.pl --force --retry=0 --ssl \
 	--skip-test-list=rh-skipped-tests.list \
-%ifarch ppc ppc64 ppc64p7
-	--nowarnings \
-%endif
 	--suite-timeout=720 --testcase-timeout=30
     # cmake build scripts will install the var cruft if left alone :-(
     rm -rf var
@@ -789,6 +788,9 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Mon Mar  4 2013 Honza Horak <hhorak@redhat.com> 5.5.29-8
+- Mask expected warnings about setrlimit in test suite
+
 * Thu Feb 28 2013 Honza Horak <hhorak@redhat.com> 5.5.29-7
 - Use configured prefix value instead of guessing basedir
   in mysql_config