From 6a94bc20edc19c8ad77e2b97372b9bbf7309639f Mon Sep 17 00:00:00 2001 From: Vasil Dimov Date: Wed, 5 Jul 2017 19:36:36 +0000 Subject: [PATCH] databases/mysqlwsrep56-server: Fix CONFLICTS_INSTALL Should also conflict with mysql56-server. --- databases/mysqlwsrep56-server/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/databases/mysqlwsrep56-server/Makefile b/databases/mysqlwsrep56-server/Makefile index ffbd220f3599..5ebcc14adf75 100644 --- a/databases/mysqlwsrep56-server/Makefile +++ b/databases/mysqlwsrep56-server/Makefile @@ -64,8 +64,7 @@ SHEBANG_FILES= scripts/*.pl* scripts/*.sh scripts/wsrep_sst_* .endif CONFLICTS_INSTALL= mariadb*-server-* \ - mysql5[0-57-9]-server-* \ - mysql8*-server-* \ + mysql[0-9]*-server-* \ percona*-server-* USE_RC_SUBR= mysql-server