Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (f0a440f46d2f14b76bbcda4fed9b6ad36a7bf5dc)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Elisamuel Resto <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (f0a440f46d2f14b76bbcda4fed9b6ad36a7bf5dc)
  • Date: Thu, 29 Apr 2010 19:34:08 -0500

GIT changes to master grimoire by Elisamuel Resto <ryuji AT sourcemage.org>:

database/mariadb/DETAILS | 5 +++--
database/mariadb/HISTORY | 4 ++++
database/mariadb/INSTALL | 18 ++++++++++++++----
database/mariadb/PREPARE | 2 ++
database/mysql/HISTORY | 3 +++
database/mysql/INSTALL | 15 +++++++++++++--
database/mysql/PREPARE | 4 +++-
7 files changed, 42 insertions(+), 9 deletions(-)

New commits:
commit f0a440f46d2f14b76bbcda4fed9b6ad36a7bf5dc
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

database/mariadb: Added llarian.net secondary mirror; copied changes from
MySQL

commit 216d8e8d18ad63bbd00bc3f96e199d04470d9d11
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

database/mysql: move sql-bench and mysql-test to shared; prompt, remove
if no

diff --git a/database/mariadb/DETAILS b/database/mariadb/DETAILS
index 34aef07..5e9bdc0 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 a72ee22..018743a 100644
--- a/database/mariadb/HISTORY
+++ b/database/mariadb/HISTORY
@@ -1,3 +1,7 @@
+2010-04-29 Elisamuel Resto <ryuji AT 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 AT sourcemage.org>
* PROVIDES: adding MYSQL

diff --git a/database/mariadb/INSTALL b/database/mariadb/INSTALL
index cdf532b..734ead5 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 0000000..ba03d1c
--- /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
diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY
index 32773b0..6865ff4 100644
--- a/database/mysql/HISTORY
+++ b/database/mysql/HISTORY
@@ -1,3 +1,6 @@
+2010-04-29 Elisamuel Resto <ryuji AT sourcemage.org>
+ * PREPARE, INSTALL: move sql-bench and mysql-test to shared; prompt,
remove if no
+
2010-04-23 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated stable to version 5.1.46

diff --git a/database/mysql/INSTALL b/database/mysql/INSTALL
index a99d737..a571c98 100755
--- a/database/mysql/INSTALL
+++ b/database/mysql/INSTALL
@@ -1,3 +1,14 @@
-make pkglibdir=${TRACK_ROOT}/usr/lib install &&
-rm -rf ${INSTALL_ROOT}/usr/mysql-test &&
+make pkglibdir="${TRACK_ROOT}/usr/lib" \
+ benchdir_root="${TRACK_ROOT}/usr/share/mysql" \
+ testroot="${TRACK_ROOT}/usr/share/mysql" \
+ install &&
+
+if [[ $MYSQL_TESTS == n ]]; then
+ rm -rf "${INSTALL_ROOT}/usr/share/mysql/mysql-test"
+fi &&
+
+if [[ $MYSQL_BENCH == n ]]; then
+ rm -fr "${INSTALL_ROOT}/usr/share/mysql/sql-bench"
+fi &&
+
install-info ${INSTALL_ROOT}/usr/share/info/mysql.info --info-dir
${INSTALL_ROOT}/usr/share/info
diff --git a/database/mysql/PREPARE b/database/mysql/PREPARE
index aecd36e..49c9240 100755
--- a/database/mysql/PREPARE
+++ b/database/mysql/PREPARE
@@ -1 +1,3 @@
-config_query OLD "Build old 5.0.X series?" n
+config_query OLD "Build old 5.0.X series?" n &&
+config_query MYSQL_TESTS "Install MySQL testing utilities?" n &&
+config_query MYSQL_BENCH "Install MySQL benchmarking utilities?" n



  • [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (f0a440f46d2f14b76bbcda4fed9b6ad36a7bf5dc), Elisamuel Resto, 04/29/2010

Archive powered by MHonArc 2.6.24.

Top of Page