Re: [PATCH] mysql: upgraded to mariadb 10.1.14

["Daniel Weismüller" <daniel.weismueller@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 2627 bytes --]

As promised :-)

For all who want to test it I've uploaded the package to my people folder.

http://people.ipfire.org/~dweismueller/mysql-10.1.14-5.ipfire

Am 06.06.2016 um 13:34 schrieb Daniel Weismüller:
> Signed-off-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org>
> ---
>   config/mysql/my.cnf          | 6 +++---
>   lfs/mysql                    | 8 ++++----
>   src/initscripts/init.d/mysql | 2 +-
>   3 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/config/mysql/my.cnf b/config/mysql/my.cnf
> index 29a568a..f301bcf 100644
> --- a/config/mysql/my.cnf
> +++ b/config/mysql/my.cnf
> @@ -1,11 +1,11 @@
>   [client]
>   password = mysqlfire
>   port = 3306
> -socket = /var/run/mysql/mysql.sock
> +socket = /var/run/mysql/mysqld.sock
>   
>   [mysqld]
>   port = 3306
> -socket = /var/run/mysql/mysql.sock
> +socket = /var/run/mysql/mysqld.sock
>   datadir = /srv/mysql
>   bind-address=127.0.0.1
>   
> @@ -14,7 +14,7 @@ user=mysql
>   
>   [mysqld_safe]
>   log-error=/var/log/mysqld.log
> -#pid-file=/var/run/mysqld/mysqld.pid
> +pid-file=/var/run/mysql/mysqld.pid
>   
>   [mysql]
>   no-auto-rehash
> diff --git a/lfs/mysql b/lfs/mysql
> index 2253928..f254e35 100644
> --- a/lfs/mysql
> +++ b/lfs/mysql
> @@ -24,7 +24,7 @@
>   
>   include Config
>   
> -VER        = 10.1.12
> +VER        = 10.1.14
>   
>   THISAPP    = mariadb-$(VER)
>   DL_FILE    = $(THISAPP).tar.gz
> @@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
>   DIR_APP    = $(DIR_SRC)/$(THISAPP)
>   TARGET     = $(DIR_INFO)/$(THISAPP)
>   PROG       = mysql
> -PAK_VER    = 4
> +PAK_VER    = 5
>   
>   CFLAGS    += -fno-strict-aliasing -fno-delete-null-pointer-checks
>   
> @@ -44,7 +44,7 @@ objects = $(DL_FILE)
>   
>   $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>   
> -$(DL_FILE)_MD5 = a2c0809f27ec112139c2c50f03569b2b
> +$(DL_FILE)_MD5 = 294925531e0fd2f0461e3894496a5adc
>   
>   install : $(TARGET)
>   
> @@ -100,7 +100,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>   		-DMYSQL_UNIX_ADDR="/var/run/mysql/mysql.sock" \
>   		-DMYSQL_DATADIR="/srv/mysql" \
>   		-DTMPDIR="/var/tmp" \
> -		-DPID_FILE_DIR="/var/run/mysql"
> +		-DPID_FILE_DIR="/var/run/mysql" \
>   		-DENABLED_LOCAL_INFILE=ON \
>   		-DWITH_EMBEDDED_SERVER=OFF \
>   		-DWITH_SSL=system \
> diff --git a/src/initscripts/init.d/mysql b/src/initscripts/init.d/mysql
> index 2c8cfbc..a798793 100644
> --- a/src/initscripts/init.d/mysql
> +++ b/src/initscripts/init.d/mysql
> @@ -10,7 +10,7 @@
>   . /etc/sysconfig/rc
>   . $rc_functions
>   
> -PIDFILE=/var/run/mysql/mysql.pid
> +PIDFILE=/var/run/mysql/mysqld.pid
>   KILLDELAY=20
>   
>   case "$1" in