diff options
| -rw-r--r-- | system/mariadb/README | 8 | ||||
| -rw-r--r-- | system/mariadb/mariadb.SlackBuild | 7 | ||||
| -rw-r--r-- | system/mariadb/mariadb.info | 8 | ||||
| -rw-r--r-- | system/mariadb/rc.mysqld | 5 |
4 files changed, 21 insertions, 7 deletions
diff --git a/system/mariadb/README b/system/mariadb/README index c10c1e258d..8b7d4ae2e6 100644 --- a/system/mariadb/README +++ b/system/mariadb/README @@ -4,10 +4,18 @@ engines, including the Aria storage engine. This conflicts with Slackware's mysql package. Do NOT install both! +This conflicts with mytop, as MariaDB already ships with its own +version of mytop. Note that mytop requires perl-TermReadKey at +runtime. + 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, but be aware that because mariadb builds this as shared library, applications linking it will no longer work with Slackware's mysql package. +Note that the default storage engine for InnoDB tables in MariaDB is +XtraDB. If you want to use Oracle's InnoDB plugin, read the notes +in rc.mysqld. + libevent is an optional dependency of mariadb. diff --git a/system/mariadb/mariadb.SlackBuild b/system/mariadb/mariadb.SlackBuild index 95685cd1a5..f456750e20 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.8 +VERSION=5.3.6 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -99,7 +99,6 @@ CXX=g++ \ --with-big-tables \ --enable-local-infile \ --with-plugins=max \ - --without-plugin-innodb_plugin \ --build=$ARCH-slackware-linux \ $embed @@ -120,8 +119,12 @@ done install -m 0644 storage/maria/ma_{pagecache,loghandler_lsn}.h \ $PKG/usr/include/mysql/ +install -m 0644 storage/maria/ha_maria.h \ + $PKG/usr/include/mysql/ sed -i "s|../storage/maria/ma_pagecache.h|ma_pagecache.h|" \ $PKG/usr/include/mysql/maria.h +sed -i "s|../storage/maria/ha_maria.h|ha_maria.h|" \ + $PKG/usr/include/mysql/sql_select.h # Add some handy library symlinks: cd $PKG/usr/lib${LIBDIRSUFFIX} diff --git a/system/mariadb/mariadb.info b/system/mariadb/mariadb.info index 04120cff50..262e800a01 100644 --- a/system/mariadb/mariadb.info +++ b/system/mariadb/mariadb.info @@ -1,10 +1,10 @@ PRGNAM="mariadb" -VERSION="5.2.8" +VERSION="5.3.6" HOMEPAGE="http://mariadb.org/" -DOWNLOAD="http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.2.8/kvm-tarbake-jaunty-x86/mariadb-5.2.8.tar.gz" -MD5SUM="7b78be87df6a59ecd7a8c06a7e72eb83" +DOWNLOAD="http://mirror2.hs-esslingen.de/mariadb/mariadb-5.3.6/kvm-tarbake-jaunty-x86/mariadb-5.3.6.tar.gz" +MD5SUM="1720dc637ae1b27a6147b166e53b52be" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Heinz Wiesinger" EMAIL="pprkut@liwjatan.at" -APPROVED="rworkman" +APPROVED="dsomero" diff --git a/system/mariadb/rc.mysqld b/system/mariadb/rc.mysqld index 300e6eb2d3..a509d68aca 100644 --- a/system/mariadb/rc.mysqld +++ b/system/mariadb/rc.mysqld @@ -31,6 +31,9 @@ # uncommented to improve system security. SKIP="--skip-networking" +# Uncomment the next line to use Oracle's InnoDB plugin instead of the included XtraDB +#INNODB="--ignore-builtin-innodb --plugin-load=innodb=ha_innodb_plugin.so" + # Start mysqld: mysqld_start() { if [ -x /usr/bin/mysqld_safe ]; then @@ -41,7 +44,7 @@ mysqld_start() { rm -f /var/run/mysql/mysql.pid fi fi - /usr/bin/mysqld_safe --datadir=/var/lib/mysql --pid-file=/var/run/mysql/mysql.pid $SKIP & + /usr/bin/mysqld_safe --datadir=/var/lib/mysql --pid-file=/var/run/mysql/mysql.pid $SKIP $INNODB & fi } |