diff options
| -rw-r--r-- | system/mariadb/README | 4 | ||||
| -rw-r--r-- | system/mariadb/mariadb.SlackBuild | 2 | ||||
| -rw-r--r-- | system/mariadb/mariadb.info | 6 | ||||
| -rw-r--r-- | system/mariadb/rc.mysqld | 3 |
4 files changed, 9 insertions, 6 deletions
diff --git a/system/mariadb/README b/system/mariadb/README index f601c6ac5d..c10c1e258d 100644 --- a/system/mariadb/README +++ b/system/mariadb/README @@ -6,6 +6,8 @@ This conflicts with Slackware's mysql package. Do NOT install both! If you want to build the embedded mysql server (libmysqld), which you will need if you plan to (re)build amarok, then run the script -with EMBEDDED=yes in the environment. +with EMBEDDED=yes in the environment, but be aware that because +mariadb builds this as shared library, applications linking it +will no longer work with Slackware's mysql package. libevent is an optional dependency of mariadb. diff --git a/system/mariadb/mariadb.SlackBuild b/system/mariadb/mariadb.SlackBuild index 2babb4712f..3c4d600de9 100644 --- a/system/mariadb/mariadb.SlackBuild +++ b/system/mariadb/mariadb.SlackBuild @@ -27,7 +27,7 @@ # MariaDB version maintained by: Heinz Wiesinger <pprkut@liwjatan.at> PRGNAM=mariadb -VERSION=5.2.4 +VERSION=5.2.5 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/mariadb/mariadb.info b/system/mariadb/mariadb.info index c5ff81ddf8..dbfd4c8673 100644 --- a/system/mariadb/mariadb.info +++ b/system/mariadb/mariadb.info @@ -1,8 +1,8 @@ PRGNAM="mariadb" -VERSION="5.2.4" +VERSION="5.2.5" HOMEPAGE="http://mariadb.org/" -DOWNLOAD="http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.2.4/kvm-tarbake-jaunty-x86/mariadb-5.2.4.tar.gz" -MD5SUM="f58ab0b97e99b2359c33d43b9e636ed7" +DOWNLOAD="http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.2.5/kvm-tarbake-jaunty-x86/mariadb-5.2.5.tar.gz" +MD5SUM="a1c09a0cd1934a7a9432106123cb5a5c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Heinz Wiesinger" diff --git a/system/mariadb/rc.mysqld b/system/mariadb/rc.mysqld index 753a175fc1..300e6eb2d3 100644 --- a/system/mariadb/rc.mysqld +++ b/system/mariadb/rc.mysqld @@ -51,7 +51,8 @@ mysqld_stop() { if [ -r /var/run/mysql/mysql.pid ]; then killall mysqld # Wait at least one minute for it to exit, as we don't know how big the DB is... - for second in $(seq 0 60) ; do + for second in 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 \ + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 60 ; do if [ ! -r /var/run/mysql/mysql.pid ]; then break; fi |