Changeset c6b5c9a

Timestamp:

10/05/2014 01:48:58 AM (10 years ago)

Author:

Christopher Gregory <cjg@…>

Branches:

kde5-14686, systemd-13485

Children:

de106f59

Parents:

31f08b1

Message:

Manually merge mariadb update from trunk.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@14494 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• packages.ent (modified) (1 diff)
• server/databases/mariadb-systemd.xml (modified) (2 diffs)

packages.ent

@@ -411 +411 @@
 <!-- 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">

server/databases/mariadb-systemd.xml

@@ -7 +7 @@
   <!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)">
 ]>
 
@@ -138 +138 @@
 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>