better merge

OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=147
2014-05-23 08:06:28 +00:00
parent 66bae66355
commit b324957121
6 changed files with 22 additions and 20 deletions
--- a/1
+++ b/1
@@ -13,3 +13,4 @@ mariadb-10.0.5-deharcode-libdir.patch
 mysql-5.5.31-upgrade-datadir.patch
 mysql-community-server-5.6.12-srv_buf_size.patch
 mariadb-10.0.9-perl-in-bench.patch
+mariadb-10.0.11-header_files_const_warnings.patch