[Lunar-commits] <moonbase-other> Merge branch 'mariadb-bump'

[v4hn]

commit cb34af8e91cb414defb4a9dc998eca45a2c91e93
Author: v4hn <me at v4hn.de>
Date: Sat, 18 Jan 2014 16:26:57 -0800
URL: https://github.com/lunar-linux/moonbase-other/commit/cb34af8e91cb414defb4a9dc998eca45a2c91e93

Merge branch 'mariadb-bump'
---
  sql/mariadb/BUILD     | +2/-1     
  sql/mariadb/CONFIGURE | +0/-1     
  sql/mariadb/DETAILS   | +3/-3     
  3 files changed, 5 insertions(+), 5 deletions(-)

--- a/sql/mariadb/BUILD
+++ b/sql/mariadb/BUILD
@@ -27,7 +27,8 @@ OPTS+=" -DSYSCONFDIR=/etc/mysql \
 -DWITH_MYISAMMRG_STORAGE_ENGINE=1 \
 -DWITH_MYISAM_STORAGE_ENGINE=1 \
 -DWITHOUT_OQGRAPH_STORAGE_ENGINE=1 \
--DWITHOUT_EXAMPLE_STORAGE_ENGINE=1"
+-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
+-DWITHOUT_TOKUDB_STORAGE_ENGINE=1"
 
 
 # A few of these flags are necessary when building mariadb with gcc >= 4.4
--- a/sql/mariadb/CONFIGURE
+++ b/sql/mariadb/CONFIGURE
@@ -1,5 +1,4 @@
 mquery USE_ARCHIVE "Enable 'archive' storage engine support?" n "-DWITH_ARCHIVE_STORAGE_ENGINE=1" "-DWITHOUT_ARCHIVE_STORAGE_ENGINE=1"
 mquery USE_BLACKHOLE "Enable 'blackhole' storage engine support?" n "-DWITH_BLACKHOLE_STORAGE_ENGINE=1" "-DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1"
 mquery USE_PARTITION "Enable 'partition' storage engine support?" n "-DWITH_PARTITION_STORAGE_ENGINE=1" "-DWITHOUT_PARTITION_STORAGE_ENGINE=1"
-mquery USE_TOKUDB "Enable 'tokudb' storage engine support?" n "-DWITH_TOKUDB_STORAGE_ENGINE=1" "-DWITHOUT_TOKUDB_STORAGE_ENGINE=1"
 mquery USE_FEDERATED "Enable 'federated' storage engine support?" n "-DWITH_FEDERATED_STORAGE_ENGINE=1" "-DWITHOUT_FEDERATED_STORAGE_ENGINE=1"
--- a/sql/mariadb/DETAILS
+++ b/sql/mariadb/DETAILS
@@ -1,11 +1,11 @@
           MODULE=mariadb
-         VERSION=5.5.33a
+         VERSION=5.5.34
           SOURCE=${MODULE}-${VERSION}.tar.gz
       SOURCE_URL=http://mirrors.supportex.net/mariadb/mariadb-$VERSION/kvm-tarbake-jaunty-x86
-      SOURCE_VFY=sha1:49fb26cd08c56e1fda42d728eaae9e49ecd5c30d
+      SOURCE_VFY=sha1:8a7d8f6094faa35cc22bc084a0e0d8037fd4ba03
         WEB_SITE="https://mariadb.org/"
          ENTERED=20130921
-         UPDATED=20130921
+         UPDATED=20140118
            SHORT="Fast SQL database server, drop-in replacement for MySQL"
 
 cat <<EOF