Signed-off-by: Daniel Weismüller daniel.weismueller@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
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@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" \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
Hi Daniel, have installed MariaDB and wanted to give you a fast feedback. Since i had the old MySQL installed but only stopped and not uninstalled before installation i faced two problems after installation. The first one was while installation process where i got the following output:
Restoring Backup... ...Finished. /opt/pakfire/lib/functions.sh: line 93: /etc/init.d/: Is a directory MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL still noch running... Exiting.
but i could start MariaDB with an /etc/init.d/mysql start. Currently not sure where this problem comes from.
The second one was, i tried to entered into MariaDB over the root user but no password delivers the same than the old password which was 'mysqlfire', the output was:
ERROR 1045 (28000): Access denied for user 'root'@'localhost' (using password: YES)
i needed to make a fast work around:
/etc/init.d/mysql stop mysqld_safe --skip-grant-tables --skip-networking &
than it was possible to entered into via a second console into MariaDB without password and i could set in that way also the new/(old) one:
mysql -u root use mysql; update user set password=PASSWORD("mysqlfire") where User='root'; flush privileges; exit
may this could help someone else, or you have some other hints for upgrading the old to the new one ?!
Have added new databases, tables and templates which seems to work smoothly. I try currently to use the new MariaDB for pmacct --> http://forum.ipfire.org/viewtopic.php?f=50&t=14849#p90102 will see how it works...
Greetings,
Erik
Am 06.06.2016 um 13:40 schrieb Daniel Weismüller daniel.weismueller@ipfire.org:
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@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" \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
Hi Erik
Did you installed it like this? "name=mysql ./update.sh"
Or how?
- Daniel
Am 07.06.2016 um 12:24 schrieb ummeegge:
Hi Daniel, have installed MariaDB and wanted to give you a fast feedback. Since i had the old MySQL installed but only stopped and not uninstalled before installation i faced two problems after installation. The first one was while installation process where i got the following output:
Restoring Backup... ...Finished. /opt/pakfire/lib/functions.sh: line 93: /etc/init.d/: Is a directory MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL still noch running... Exiting.
but i could start MariaDB with an /etc/init.d/mysql start. Currently not sure where this problem comes from.
The second one was, i tried to entered into MariaDB over the root user but no password delivers the same than the old password which was 'mysqlfire', the output was:
ERROR 1045 (28000): Access denied for user 'root'@'localhost' (using password: YES)
i needed to make a fast work around:
/etc/init.d/mysql stop mysqld_safe --skip-grant-tables --skip-networking &
than it was possible to entered into via a second console into MariaDB without password and i could set in that way also the new/(old) one:
mysql -u root use mysql; update user set password=PASSWORD("mysqlfire") where User='root'; flush privileges; exit
may this could help someone else, or you have some other hints for upgrading the old to the new one ?!
Have added new databases, tables and templates which seems to work smoothly. I try currently to use the new MariaDB for pmacct --> http://forum.ipfire.org/viewtopic.php?f=50&t=14849#p90102 will see how it works...
Greetings,
Erik
Am 06.06.2016 um 13:40 schrieb Daniel Weismüller <daniel.weismueller@ipfire.org mailto:daniel.weismueller@ipfire.org>:
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 http://people.ipfire.org/%7Edweismueller/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@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
On Tue, 2016-06-07 at 14:34 +0200, Daniel Weismüller wrote:
Hi Erik
Did you installed it like this? "name=mysql ./update.sh"
NAME=mysql ./update.sh
Or how?
- Daniel
Am 07.06.2016 um 12:24 schrieb ummeegge:
Hi Daniel, have installed MariaDB and wanted to give you a fast feedback. Since i had the old MySQL installed but only stopped and not uninstalled before installation i faced two problems after installation. The first one was while installation process where i got the following output:
Restoring Backup... ...Finished. /opt/pakfire/lib/functions.sh: line 93: /etc/init.d/: Is a directory MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL still noch running... Exiting.
but i could start MariaDB with an /etc/init.d/mysql start. Currently not sure where this problem comes from.
The second one was, i tried to entered into MariaDB over the root user but no password delivers the same than the old password which was 'mysqlfire', the output was:
ERROR 1045 (28000): Access denied for user 'root'@'localhost' (using password: YES)
i needed to make a fast work around:
/etc/init.d/mysql stop mysqld_safe --skip-grant-tables --skip-networking &
than it was possible to entered into via a second console into MariaDB without password and i could set in that way also the new/(old) one:
mysql -u root use mysql; update user set password=PASSWORD("mysqlfire") where User='root'; flush privileges; exit
may this could help someone else, or you have some other hints for upgrading the old to the new one ?!
Have added new databases, tables and templates which seems to work smoothly. I try currently to use the new MariaDB for pmacct --> http://forum.ipfire.or g/viewtopic.php?f=50&t=14849#p90102 will see how it works...
Greetings,
Erik
Am 06.06.2016 um 13:40 schrieb Daniel Weismüller <daniel.weismueller@ipfire. org>:
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@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
Hi all, no Daniel i used it in the old fashion way. Will check the next installation by the described procedure. Have seen you opened up a topic in the forum, will post you there my results.
Thank you both. Greetings,
Erik
Am 07.06.2016 um 14:35 schrieb Michael Tremer michael.tremer@ipfire.org:
On Tue, 2016-06-07 at 14:34 +0200, Daniel Weismüller wrote:
Hi Erik
Did you installed it like this? "name=mysql ./update.sh"
NAME=mysql ./update.sh
Or how?
- Daniel
Am 07.06.2016 um 12:24 schrieb ummeegge:
Hi Daniel, have installed MariaDB and wanted to give you a fast feedback. Since i had the old MySQL installed but only stopped and not uninstalled before installation i faced two problems after installation. The first one was while installation process where i got the following output:
Restoring Backup... ...Finished. /opt/pakfire/lib/functions.sh: line 93: /etc/init.d/: Is a directory MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL server is still not running. Waiting 5 seconds. MySQL still noch running... Exiting.
but i could start MariaDB with an /etc/init.d/mysql start. Currently not sure where this problem comes from.
The second one was, i tried to entered into MariaDB over the root user but no password delivers the same than the old password which was 'mysqlfire', the output was:
ERROR 1045 (28000): Access denied for user 'root'@'localhost' (using password: YES)
i needed to make a fast work around:
/etc/init.d/mysql stop mysqld_safe --skip-grant-tables --skip-networking &
than it was possible to entered into via a second console into MariaDB without password and i could set in that way also the new/(old) one:
mysql -u root use mysql; update user set password=PASSWORD("mysqlfire") where User='root'; flush privileges; exit
may this could help someone else, or you have some other hints for upgrading the old to the new one ?!
Have added new databases, tables and templates which seems to work smoothly. I try currently to use the new MariaDB for pmacct --> http://forum.ipfire.or g/viewtopic.php?f=50&t=14849#p90102 will see how it works...
Greetings,
Erik
Am 06.06.2016 um 13:40 schrieb Daniel Weismüller <daniel.weismueller@ipfire. org>:
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@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" \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
-
Daniel Weismüller -
Michael Tremer -
ummeegge