Attachment 149177 Details for Bug 188181 – rerolled bsd.databases.mk patch

[patch] rerolled bsd.databases.mk patch

372303M.patch (text/plain), 1.95 KB, created by Nikolai Lifanov on 2014-11-08 04:42:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nikolai Lifanov

Created: 2014-11-08 04:42:47 UTC

Size: 1.95 KB

patch

obsolete

>Index: Mk/bsd.database.mk
>===================================================================
>--- Mk/bsd.database.mk	(revision 372303)
>+++ Mk/bsd.database.mk	(working copy)
>@@ -127,8 +127,12 @@
> MYSQL55_LIBVER=		18
> MYSQL55m_LIBVER=	18
> MYSQL55p_LIBVER=	18
>+MYSQL55g_LIBVER=	18
>+MYSQL55mg_LIBVER=	18
> MYSQL56_LIBVER=		18
> MYSQL56p_LIBVER=	18
>+MYSQL56g_LIBVER=	18
>+MYSQL56mg_LIBVER=	18
> MYSQL100m_LIBVER=	18
> 
> # Setting/finding MySQL version we want.
>@@ -135,12 +139,18 @@
> .if exists(${LOCALBASE}/bin/mysql)
> _MYSQL!=	${LOCALBASE}/bin/mysql --version | ${SED} -e 's/.*Distrib $[0-9]\{1,2\}$\.$[0-9]*$.*/\1\2/'
> _PERCONA!=	${LOCALBASE}/bin/mysql --version | ${GREP} Percona | wc -l
>-_MARIADB!=	${LOCALBASE}/bin/mysql --version | ${GREP} MariaDB | wc -l
>+_MARIADB!=	${LOCALBASE}/bin/mysql --version | ${GREP} MariaDB, | wc -l
>+_MYSQL-GALERA!=		${LOCALBASE}/bin/mysql --version | ${GREP} MySQL-Galera | wc -l
>+_MARIADB-GALERA!=	${LOCALBASE}/bin/mysql --version | ${GREP} MariaDB-Galera | wc -l
> 
> .if ${_PERCONA} == 1
> _MYSQL_VER=	${_MYSQL}p
> .elif ${_MARIADB} == 1
> _MYSQL_VER=	${_MYSQL}m
>+.elif ${_MARIADB-GALERA} == 1
>+_MYSQL_VER=    ${_MYSQL}mg
>+.elif ${_MYSQL-GALERA} == 1
>+_MYSQL_VER=    ${_MYSQL}g
> .else
> _MYSQL_VER=	${_MYSQL}
> .endif
>@@ -179,9 +189,18 @@
> .elif (${MYSQL_VER} == "55p")
> _MYSQL_CLIENT=	databases/percona55-client
> _MYSQL_SERVER=	databases/percona55-server
>+.elif (${MYSQL_VER} == "55mg")
>+_MYSQL_CLIENT=	databases/mariadb55-galera-client
>+_MYSQL_SERVER=	databases/mariadb55-galera-server
>+.elif (${MYSQL_VER} == "55g")
>+_MYSQL_CLIENT=	databases/mysql55-galera-client
>+_MYSQL_SERVER=	databases/mysql55-galera-server
> .elif (${MYSQL_VER} == "56p")
> _MYSQL_CLIENT=	databases/percona56-client
> _MYSQL_SERVER=	databases/percona56-server
>+.elif (${MYSQL_VER} == "56g")
>+_MYSQL_CLIENT=	databases/mysql56-galera-client
>+_MYSQL_SERVER=	databases/mysql56-galera-server
> .else
> _MYSQL_CLIENT=	databases/mysql${MYSQL_VER}-client
> _MYSQL_SERVER=	databases/mysql${MYSQL_VER}-server

Actions: View | Diff

Attachments on bug 188181: 141398 | 149177