[blfs-book] r14494 - in branches/systemd: . server/databases

[cjg]

Author: cjg
Date: Sat Oct  4 18:48:58 2014
New Revision: 14494

Log:
Manually merge mariadb update from trunk.

Modified:
   branches/systemd/packages.ent
   branches/systemd/server/databases/mariadb-systemd.xml

Modified: branches/systemd/packages.ent
==============================================================================
--- branches/systemd/packages.ent       Sat Oct  4 18:34:47 2014        (r14493)
+++ branches/systemd/packages.ent       Sat Oct  4 18:48:58 2014        (r14494)
@@ -410,7 +410,7 @@
 
 <!-- Chapter 22 -->
 <!ENTITY db-version                   "6.1.19">
-<!ENTITY mariadb-version              "10.0.13">
+<!ENTITY mariadb-version              "10.0.14">
 <!ENTITY postgresql-version           "9.3.5">
 <!ENTITY sqlite-version               "3.8.6">
 

Modified: branches/systemd/server/databases/mariadb-systemd.xml
==============================================================================
--- branches/systemd/server/databases/mariadb-systemd.xml       Sat Oct  4 
18:34:47 2014        (r14493)
+++ branches/systemd/server/databases/mariadb-systemd.xml       Sat Oct  4 
18:48:58 2014        (r14494)
@@ -6,10 +6,10 @@
 
   <!ENTITY mariadb-download-http 
"https://downloads.mariadb.org/interstitial/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz";>
   <!ENTITY mariadb-download-ftp  
"ftp://mirrors.fe.up.pt/pub/mariadb/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz";>
-  <!ENTITY mariadb-md5sum        "7b2e88864b51d7d0607dc37abb8a0adb">
+  <!ENTITY mariadb-md5sum        "80fea71de54a9cfa7f5508df53d3f06d">
   <!ENTITY mariadb-size          "49 MB">
   <!ENTITY mariadb-buildsize     "1.4 GB">
-  <!ENTITY mariadb-time          "9.4 SBU (additional 0.4 SBU for the tests)">
+  <!ENTITY mariadb-time          "9.5 SBU (additional 0.4 SBU for the tests)">
 ]>
 
 <sect1 id="mariadb" xreflabel="MariaDB-&mariadb-version;">
@@ -137,23 +137,23 @@
 sed -i "s/srv_buf_size/srv_sort_buf_size/" storage/innobase/row/row0log.cc 
&amp;&amp;
 mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DINSTALL_DOCDIR=share/doc/mysql \
-      -DINSTALL_DOCREADMEDIR=share/doc/mysql \
-      -DINSTALL_MANDIR=share/man \
-      -DINSTALL_MYSQLSHAREDIR=share/mysql \
-      -DINSTALL_MYSQLTESTDIR=share/mysql/test \
-      -DINSTALL_PLUGINDIR=lib/mysql/plugin \
-      -DINSTALL_SBINDIR=sbin \
-      -DINSTALL_SCRIPTDIR=bin \
-      -DINSTALL_SQLBENCHDIR=share/mysql/bench \
-      -DINSTALL_SUPPORTFILESDIR=share/mysql \
-      -DMYSQL_DATADIR=/srv/mysql \
-      -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \
-      -DWITH_EXTRA_CHARSETS=complex \
-      -DWITH_EMBEDDED_SERVER=ON \
-      -DTOKUDB_OK=0 \
+cmake -DCMAKE_BUILD_TYPE=Release                       \
+      -DCMAKE_INSTALL_PREFIX=/usr                      \
+      -DINSTALL_DOCDIR=share/doc/mariadb-&mariadb-version;       \
+      -DINSTALL_DOCREADMEDIR=share/doc/mariadb-&mariadb-version; \
+      -DINSTALL_MANDIR=share/man                       \
+      -DINSTALL_MYSQLSHAREDIR=share/mysql              \
+      -DINSTALL_MYSQLTESTDIR=share/mysql/test          \
+      -DINSTALL_PLUGINDIR=lib/mysql/plugin             \
+      -DINSTALL_SBINDIR=sbin                           \
+      -DINSTALL_SCRIPTDIR=bin                          \
+      -DINSTALL_SQLBENCHDIR=share/mysql/bench          \
+      -DINSTALL_SUPPORTFILESDIR=share/mysql            \
+      -DMYSQL_DATADIR=/srv/mysql                       \
+      -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock        \
+      -DWITH_EXTRA_CHARSETS=complex                    \
+      -DWITH_EMBEDDED_SERVER=ON                        \
+      -DTOKUDB_OK=0                                    \
       .. &amp;&amp;
 make</userinput></screen>
 
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page