summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElisamuel Resto2010-04-29 14:02:01 -0400
committerElisamuel Resto2010-04-29 20:33:55 -0400
commitf0a440f46d2f14b76bbcda4fed9b6ad36a7bf5dc (patch)
tree9c8608a3530d277c856a326d92dbd0e57bebd3d9
parent216d8e8d18ad63bbd00bc3f96e199d04470d9d11 (diff)
database/mariadb: Added llarian.net secondary mirror; copied changes from MySQL
-rwxr-xr-xdatabase/mariadb/DETAILS5
-rw-r--r--database/mariadb/HISTORY4
-rwxr-xr-xdatabase/mariadb/INSTALL18
-rwxr-xr-xdatabase/mariadb/PREPARE2
4 files changed, 23 insertions, 6 deletions
diff --git a/database/mariadb/DETAILS b/database/mariadb/DETAILS
index 34aef073f0..5e9bdc042f 100755
--- a/database/mariadb/DETAILS
+++ b/database/mariadb/DETAILS
@@ -5,14 +5,15 @@
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_HASH=sha512:b8c0e9fd0c8447962c94f4d82948b3c3154c25cf2587ee1e7c50b39dc4e81c6548ace118461a46f673d296414188fc59dc280419a9831dce7286896699db19d9
SOURCE_URL[0]=http://ftp.rediris.es/mirror/MariaDB/${SPELL}-${VERSION}/distro/kvm-tarbake-jaunty-x86/${SOURCE}
+ SOURCE_URL[1]=http://maria.llarian.net/download/${SPELL}-${VERSION}/distro/kvm-tarbake-jaunty-x86/${SOURCE}
LICENSE[0]=GPL
WEB_SITE=http://askmonty.org/wiki/MariaDB
KEYWORDS="sql database"
ENTERED=20011114
- SHORT="MariaDB is a backward compatible, drop-in replacement branch of the MySQL® Database Sever"
+ SHORT="MariaDB is a backward compatible, drop-in replacement branch of the MySQL(r) Database Sever"
cat << EOF
MariaDB is a backward compatible, drop-in replacement branch of the
-MySQL® Database Server.
+MySQL(r) Database Server.
It includes all major open source storage engines,
including the Maria storage engine.
diff --git a/database/mariadb/HISTORY b/database/mariadb/HISTORY
index a72ee229d5..018743a019 100644
--- a/database/mariadb/HISTORY
+++ b/database/mariadb/HISTORY
@@ -1,3 +1,7 @@
+2010-04-29 Elisamuel Resto <ryuji@sourcemage.org>
+ * DETAILS: Added llarian.net as secondary mirror
+ * INSTALL, PREPARE: copied changes from MySQL spell for sql-bench and mysql-test
+
2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster@sourcemage.org>
* PROVIDES: adding MYSQL
diff --git a/database/mariadb/INSTALL b/database/mariadb/INSTALL
index cdf532bcdb..734ead548b 100755
--- a/database/mariadb/INSTALL
+++ b/database/mariadb/INSTALL
@@ -1,4 +1,14 @@
-make pkglibdir=${TRACK_ROOT}/usr/lib install &&
-rm -rf ${INSTALL_ROOT}/usr/mysql-test &&
-install -m 0644 $SCRIPT_DIRECTORY/profile.d/mariadb $INSTALL_ROOT/etc/sysconfig &&
-install-info ${INSTALL_ROOT}/usr/share/info/mysql.info --info-dir ${INSTALL_ROOT}/usr/share/info
+make pkglibdir="${TRACK_ROOT}/usr/lib" \
+ benchdir_root="${TRACK_ROOT}/usr/share/mysql" \
+ testroot="${TRACK_ROOT}/usr/share/mysql" \
+ install &&
+
+if [[ $MARIA_TESTS == n ]]; then
+ rm -rf "${INSTALL_ROOT}/usr/share/mysql/mysql-test"
+fi &&
+
+if [[ $MARIA_BENCH == n ]]; then
+ rm -fr "${INSTALL_ROOT}/usr/share/mysql/sql-bench"
+fi &&
+
+install -m 0644 $SCRIPT_DIRECTORY/profile.d/mariadb $INSTALL_ROOT/etc/sysconfig
diff --git a/database/mariadb/PREPARE b/database/mariadb/PREPARE
new file mode 100755
index 0000000000..ba03d1c228
--- /dev/null
+++ b/database/mariadb/PREPARE
@@ -0,0 +1,2 @@
+config_query MARIA_TESTS "Install MySQL testing utilities?" n &&
+config_query MARIA_BENCH "Install MySQL benchmarking utilities?" n