[blfs-book] r12960 - in trunk/BOOK: . archive general/genlib general/prog general/sysutils introduction/welcome kde/core multimedia/audioutils postlfs/security server/databases server/mail server/major server/other x/lib xsoft/office

bdubbs at higgs.linuxfromscratch.org bdubbs at higgs.linuxfromscratch.org
Wed Apr 16 09:05:10 PDT 2014


Author: bdubbs
Date: Wed Apr 16 09:05:09 2014
New Revision: 12960

Log:
Updated to mariadb-10.0.10.
Archived mysql.

Added:
   trunk/BOOK/archive/mysql.xml
      - copied unchanged from r12958, trunk/BOOK/server/databases/mysql.xml
Deleted:
   trunk/BOOK/server/databases/mysql.xml
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/genlib/apr-util.xml
   trunk/BOOK/general/prog/php.xml
   trunk/BOOK/general/sysutils/redland.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/kde/core/akonadi.xml
   trunk/BOOK/multimedia/audioutils/amarok.xml
   trunk/BOOK/postlfs/security/cyrus-sasl.xml
   trunk/BOOK/server/databases/databases.xml
   trunk/BOOK/server/databases/mariadb.xml
   trunk/BOOK/server/mail/dovecot.xml
   trunk/BOOK/server/mail/exim.xml
   trunk/BOOK/server/mail/postfix.xml
   trunk/BOOK/server/major/bind.xml
   trunk/BOOK/server/major/proftpd.xml
   trunk/BOOK/server/other/openldap.xml
   trunk/BOOK/x/lib/qt4.xml
   trunk/BOOK/x/lib/qt5.xml
   trunk/BOOK/xsoft/office/libreoffice.xml

Copied: trunk/BOOK/archive/mysql.xml (from r12958, trunk/BOOK/server/databases/mysql.xml)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/BOOK/archive/mysql.xml	Wed Apr 16 09:05:09 2014	(r12960, copy of r12958, trunk/BOOK/server/databases/mysql.xml)
@@ -0,0 +1,478 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY mysql-download-http "http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-&mysql-version;.tar.gz">
+  <!ENTITY mysql-download-ftp  " ">
+  <!ENTITY mysql-md5sum        "1d3d91e8459c719bbef7c97bb499634d">
+  <!ENTITY mysql-size          "32 MB">
+  <!ENTITY mysql-buildsize     "572 MB (additional 359 MB installed)">
+  <!ENTITY mysql-time          "6.3 SBU">
+]>
+
+<sect1 id="mysql" xreflabel="MySQL-&mysql-version;">
+  <?dbhtml filename="mysql.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>MySQL-&mysql-version;</title>
+
+  <indexterm zone="mysql">
+    <primary sortas="a-MySQL">MySQL</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to MySQL</title>
+
+    <para>
+      <application>MySQL</application> is a widely used and fast SQL database
+      server. It is a client/server implementation that consists of a
+      server daemon and many different client programs and libraries.
+    </para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&mysql-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&mysql-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &mysql-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &mysql-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &mysql-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &mysql-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Optional patch (recommended if building for Amarok):
+          <ulink url="&patch-root;/mysql-&mysql-version;-embedded_library_shared-1.patch"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Optional Documentation (see tip below):
+          <ulink url="http://dev.mysql.com/doc/"/>
+        </para>
+       </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">MySQL Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="cmake"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libevent"/> and
+      <xref linkend="openssl"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <ulink url="http://packages.debian.org/source/sid/libaio">libaio</ulink> and
+      <ulink url="http://www.thrysoee.dk/editline/">libedit</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/mysql"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of MySQL</title>
+
+    <para>
+      For security reasons, running the server as an unprivileged user
+      and group is strongly encouraged. Issue the following (as
+      <systemitem class="username">root</systemitem>) to create the
+      user and group:
+    </para>
+
+<screen role="root"><userinput>groupadd -g 40 mysql &&
+useradd -c "MySQL Server" -d /srv/mysql -g mysql -s /bin/false -u 40 mysql</userinput></screen>
+
+    <para>
+      If the MySQL server is not needed, it is possible to build only the
+      client libraries of MySQL. To do this you need to add
+      <parameter>-DWITHOUT_SERVER=ON</parameter> to the <command>cmake</command>
+      command below.
+    </para>
+
+    <para>
+      MySQL contains an embedded server library. By default, it is built as a
+      statically linked library, <filename>libmysqld.a</filename>, but by
+      applying the optional patch, a shared version of this library can be built.
+      The library is needed by certain applications, such as
+      <application>Amarok</application> and it is recommend to use the shared
+      libraries whenever it is possible.
+    </para>
+
+    <para>
+      There are numerous options available to
+      <command>cmake</command>. Check the output of the `<command>cmake .
+      -LH</command>` for additional customization options. See the <ulink
+      url="http://dev.mysql.com/doc/refman/5.6/en/source-configuration-options.html">
+      MySQL Documentation</ulink> for a full listing of all options.
+    </para>
+
+    <para>
+      If you want to build shared version of the embedded server library, apply
+      the following patch:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../mysql-&mysql-version;-embedded_library_shared-1.patch</userinput></screen>
+
+    <para>
+      Install <application>MySQL</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>sed -i "/ADD_SUBDIRECTORY(sql\/share)/d" CMakeLists.txt &&
+sed -i "s/ADD_SUBDIRECTORY(libmysql)/&\\nADD_SUBDIRECTORY(sql\/share)/" CMakeLists.txt &&
+sed -i "s at data/test@\${INSTALL_MYSQLSHAREDIR}@g" sql/CMakeLists.txt &&
+sed -i "s at data/mysql@\${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt &&
+
+sed -i "s/srv_buf_size/srv_sort_buf_size/" storage/innobase/row/row0log.cc &&
+
+mkdir build &&
+cd build &&
+
+cmake -DCMAKE_BUILD_TYPE=Release                    \
+      -DCMAKE_INSTALL_PREFIX=/usr                   \
+      -DINSTALL_DOCDIR=share/doc/mysql              \
+      -DINSTALL_DOCREADMEDIR=share/doc/mysql        \
+      -DINSTALL_INCLUDEDIR=include/mysql            \
+      -DINSTALL_INFODIR=share/info                  \
+      -DINSTALL_MANDIR=share/man                    \
+      -DINSTALL_MYSQLDATADIR=/srv/mysql             \
+      -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     \
+      -DSYSCONFDIR=/etc/mysql                       \
+      -DWITH_PERFSCHEMA_STORAGE_ENGINE=OFF          \
+      -DWITH_EXTRA_CHARSETS=complex                 \
+      -DWITH_LIBEVENT=system                        \
+      -DWITH_SSL=system                             \
+      .. &&
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make test</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <tip>
+      <para>
+        The only documentation shipped in the source tarball are
+        <filename>mysql.info</filename> and man pages. You can download
+        various formats of the <application>MySQL</application>
+        Reference Manual from <ulink url="http://dev.mysql.com/doc/"/>.
+      </para>
+    </tip>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>sed -i ...</command>: First two seds fix client-only builds.
+        Following two seds set correct installation directories for some
+        components. Last one fixes a bug in the code.
+    </para>
+
+    <para>
+      <parameter>-DWITHOUT_SERVER=ON</parameter>: Use this switch if you don't
+      want the server and would like to build the client only.
+    </para>
+
+    <para>
+      <parameter>-DWITH_EXTRA_CHARSETS=complex</parameter>: This switch enables
+      support for the complex character sets.
+    </para>
+
+    <para>
+      <parameter>-DWITH_LIBEVENT=system</parameter>: This switch is used to
+      tell the build system to use installed <application>libevent</application>.
+      Remove it if you didn't install <application>libevent</application>.
+    </para>
+
+    <para>
+      <parameter>-DWITH_SSL=system</parameter>: This switch is used to tell the
+      build system to use installed <application>OpenSSL</application>. Remove
+      it if you didn't install <application>OpenSSL</application>.
+    </para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring MySQL</title>
+
+    <sect3 id="mysql-config">
+      <title>Config Files</title>
+
+      <para>
+        <filename>/etc/mysql/my.cnf</filename> and
+        <filename>~/.my.cnf</filename>
+      </para>
+
+      <indexterm zone="mysql mysql-config">
+        <primary sortas="e-AA.my.cnf">~/.my.cnf</primary>
+      </indexterm>
+
+      <indexterm zone="mysql mysql-config">
+        <primary sortas="e-etc-mysql-my.cnf">/etc/mysql/my.cnf</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <note>
+        <para>
+          If you are upgrading from previous major version of
+          <application>MySQL</application>, be sure to consult
+          the <ulink
+          url="https://dev.mysql.com/doc/refman/5.6/en/upgrading-from-previous-series.html">
+          MySQL Reference Manual</ulink> for notes on
+          upgrading the software.
+        </para>
+      </note>
+
+      <para>
+        Create basic <filename>/etc/mysql/my.cnf</filename>
+        using the following command as the <systemitem
+        class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>install -v -dm 755 /etc/mysql &&
+cat > /etc/mysql/my.cnf << "EOF"
+<literal># Begin /etc/mysql/my.cnf
+
+# The following options will be passed to all MySQL clients
+[client]
+#password       = your_password
+port            = 3306
+socket          = /run/mysqld/mysqld.sock
+
+# The MySQL server
+[mysqld]
+port            = 3306
+socket          = /run/mysqld/mysqld.sock
+datadir         = /srv/mysql
+skip-external-locking
+key_buffer_size = 16M
+max_allowed_packet = 1M
+sort_buffer_size = 512K
+net_buffer_length = 16K
+myisam_sort_buffer_size = 8M
+
+# Don't listen on a TCP/IP port at all.
+skip-networking
+
+# required unique id between 1 and 2^32 - 1
+server-id       = 1
+
+# Uncomment the following if you are using BDB tables
+#bdb_cache_size = 4M
+#bdb_max_lock = 10000
+
+# Uncomment the following if you are using InnoDB tables
+#innodb_data_home_dir = /srv/mysql
+#innodb_data_file_path = ibdata1:10M:autoextend
+#innodb_log_group_home_dir = /srv/mysql
+# You can set .._buffer_pool_size up to 50 - 80 %
+# of RAM but beware of setting memory usage too high
+#innodb_buffer_pool_size = 16M
+#innodb_additional_mem_pool_size = 2M
+# Set .._log_file_size to 25 % of buffer pool size
+#innodb_log_file_size = 5M
+#innodb_log_buffer_size = 8M
+#innodb_flush_log_at_trx_commit = 1
+#innodb_lock_wait_timeout = 50
+
+[mysqldump]
+quick
+max_allowed_packet = 16M
+
+[mysql]
+no-auto-rehash
+# Remove the next comment character if you are not familiar with SQL
+#safe-updates
+
+[isamchk]
+key_buffer = 20M
+sort_buffer_size = 20M
+read_buffer = 2M
+write_buffer = 2M
+
+[myisamchk]
+key_buffer_size = 20M
+sort_buffer_size = 20M
+read_buffer = 2M
+write_buffer = 2M
+
+[mysqlhotcopy]
+interactive-timeout
+
+# End /etc/mysql/my.cnf</literal>
+EOF</userinput></screen>
+
+      <para>
+        You can now install a database and change the ownership to the
+        unprivileged user and group (perform as the <systemitem
+        class="username">root</systemitem> user):
+      </para>
+
+<screen role="root"><userinput>mysql_install_db --basedir=/usr --datadir=/srv/mysql --user=mysql &&
+chown -R mysql:mysql /srv/mysql</userinput></screen>
+
+      <para>
+        Further configuration requires that the
+        <application>MySQL</application> server is running. Start
+        the server using the following commands as the <systemitem
+        class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>install -v -m755 -o mysql -g mysql -d /run/mysqld &&
+mysqld_safe --user=mysql 2>&1 >/dev/null &</userinput></screen>
+
+      <para>
+        A default installation does not set up a password for the
+        administrator, so use the following command as the <systemitem
+        class="username">root</systemitem> user to set one. Replace
+        <replaceable><new-password></replaceable> with your own.
+      </para>
+
+<screen role="root"><userinput>mysqladmin -u root password <replaceable><new-password></replaceable></userinput></screen>
+
+      <para>
+        Configuration of the server is now finished. Shut the server
+        down using the following command as the <systemitem
+        class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>mysqladmin -p shutdown</userinput></screen>
+
+    </sect3>
+
+    <sect3  id="mysql-init">
+      <title>Boot Script</title>
+
+      <para>
+        Install the <filename>/etc/rc.d/init.d/mysql</filename> init script
+        included in the <xref linkend="bootscripts"/> package as
+        the <systemitem class="username">root</systemitem> user to start the
+        <application>MySQL</application> server during system boot-up.
+      </para>
+
+      <indexterm zone="mysql mysql-init">
+        <primary sortas="f-mysql">mysql</primary>
+      </indexterm>
+
+<screen role="root"><userinput>make install-mysql</userinput></screen>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          innochecksum, msql2mysql, myisamchk, myisam_ftdump, myisamlog,
+          myisampack, my_print_defaults, mysql, mysqlaccess, mysqlaccess.conf,
+          mysqladmin, mysqlbinlog, mysqlbug, mysqlcheck, mysql_client_test,
+          mysql_client_test_embedded, mysql_config, mysql_config_editor,
+          mysql_convert_table_format, mysqld, mysqld_multi, mysqld_safe, mysqldump,
+          mysqldumpslow, mysql_embedded, mysql_find_rows, mysql_fix_extensions,
+          mysqlhotcopy, mysqlimport, mysql_install_db, mysql_plugin,
+          mysql_secure_installation, mysql_setpermission, mysqlshow, mysqlslap,
+          mysqltest, mysqltest_embedded, mysql_tzinfo_to_sql, mysql_upgrade,
+          mysql_waitpid, mysql_zap, perror, replace, resolveip and
+          resolve_stack_dump
+        </seg>
+        <seg>
+          libmysqlclient.{so,a}, libmysqlclient_r.{so,a}, libmysqld.{so,a},
+          libmysqlservices.a and several under /usr/lib/mysql/plugin/
+        </seg>
+        <seg>
+          /etc/mysql,
+          /srv/mysql,
+          /usr/include/mysql,
+          /usr/lib/mysql,
+          /usr/share/doc/mysql and
+          /usr/share/mysql
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+
+    <para>
+      Descriptions of all the programs and libraries would be several
+      pages long. Instead, consult the <filename>mysql.info</filename>
+      documentation or the on-line reference manual at <ulink
+      url="http://dev.mysql.com/doc/refman/5.6/en/index.html"/>.
+    </para>
+
+    <para>
+      The <application>Perl</application> DBI modules must be installed
+      for some of the <application>MySQL</application> support programs to
+      function properly.
+    </para>
+
+  </sect2>
+
+</sect1>

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent	Wed Apr 16 07:12:15 2014	(r12959)
+++ trunk/BOOK/general.ent	Wed Apr 16 09:05:09 2014	(r12960)
@@ -510,8 +510,7 @@
 
 <!-- Chapter 22 -->
 <!ENTITY db-version                   "6.0.30">
-<!ENTITY mariadb-version              "10.0.9">
-<!ENTITY mysql-version                "5.6.16">
+<!ENTITY mariadb-version              "10.0.10">
 <!ENTITY postgresql-version           "9.3.4">
 <!ENTITY sqlite-version               "3.8.4.3">
 

Modified: trunk/BOOK/general/genlib/apr-util.xml
==============================================================================
--- trunk/BOOK/general/genlib/apr-util.xml	Wed Apr 16 07:12:15 2014	(r12959)
+++ trunk/BOOK/general/genlib/apr-util.xml	Wed Apr 16 09:05:09 2014	(r12960)
@@ -90,7 +90,7 @@
       <xref linkend="db"/>,
       <xref linkend="expat"/>,
       <ulink url="http://www.freetds.org/">FreeTDS</ulink>,
-      <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
+      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
       <xref linkend="openldap"/>,
       <xref linkend="postgresql"/>,
       <xref linkend="sqlite"/> and

Modified: trunk/BOOK/general/prog/php.xml
==============================================================================
--- trunk/BOOK/general/prog/php.xml	Wed Apr 16 07:12:15 2014	(r12959)
+++ trunk/BOOK/general/prog/php.xml	Wed Apr 16 09:05:09 2014	(r12960)
@@ -115,7 +115,7 @@
     <para role="optional"><xref linkend="openldap"/>,
     <!-- <xref linkend="gdbm"/>, -->
     <xref linkend="db"/>,
-    <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
+    <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
     <xref linkend="postgresql"/>,
     <xref linkend="unixodbc"/>,
     <xref linkend="sqlite"/>,

Modified: trunk/BOOK/general/sysutils/redland.xml
==============================================================================
--- trunk/BOOK/general/sysutils/redland.xml	Wed Apr 16 07:12:15 2014	(r12959)
+++ trunk/BOOK/general/sysutils/redland.xml	Wed Apr 16 09:05:09 2014	(r12960)
@@ -70,7 +70,7 @@
     <xref linkend="db"/>,
     <xref linkend="libiodbc"/>,
     <xref linkend="sqlite"/>,
-    <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
+    <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
     <xref linkend="postgresql"/>,
     <xref linkend="virtuoso"/> and
     <ulink url="http://sourceforge.net/projects/threestore/">3store</ulink>

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	Wed Apr 16 07:12:15 2014	(r12959)
+++ trunk/BOOK/introduction/welcome/changelog.xml	Wed Apr 16 09:05:09 2014	(r12960)
@@ -45,6 +45,20 @@
 -->
 
     <listitem>
+      <para>April 16th, 2014</para>
+      <itemizedlist>
+       <listitem>
+          <para>[bdubbs] - Updated to mariadb-10.0.10. Fixes
+          <ulink url="&blfs-ticket-root;4883">#4883</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Archived mysql. Fixes
+          <ulink url="&blfs-ticket-root;4899">#4899</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>April 15th, 2014</para>
       <itemizedlist>
        <listitem>

Modified: trunk/BOOK/kde/core/akonadi.xml
==============================================================================
--- trunk/BOOK/kde/core/akonadi.xml	Wed Apr 16 07:12:15 2014	(r12959)
+++ trunk/BOOK/kde/core/akonadi.xml	Wed Apr 16 09:05:09 2014	(r12960)
@@ -65,9 +65,10 @@
     <xref linkend="shared-mime-info"/>,
     <xref linkend="boost"/>,
     <xref linkend="soprano"/>, and one of:
-    <xref linkend="sqlite"/>,
-    <xref linkend="mariadb"/>, <xref linkend="mysql"/>, or
-    <xref linkend="postgresql"/>
+     <xref linkend="sqlite"/>,
+     <xref linkend="mariadb"/>, 
+     <ulink url="http://www.mysql.com/">MySQL</ulink>, or
+     <xref linkend="postgresql"/>
     </para>
 
     <para condition="html" role="usernotes">User Notes:

Modified: trunk/BOOK/multimedia/audioutils/amarok.xml
==============================================================================
--- trunk/BOOK/multimedia/audioutils/amarok.xml	Wed Apr 16 07:12:15 2014	(r12959)
+++ trunk/BOOK/multimedia/audioutils/amarok.xml	Wed Apr 16 09:05:09 2014	(r12960)
@@ -77,7 +77,7 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
       <xref linkend="kdelibs"/>,
-      <xref linkend="mariadb"/> or <xref linkend="mysql"/>, and
+      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>, and
       <xref linkend="taglib"/>
     </para>
 

Modified: trunk/BOOK/postlfs/security/cyrus-sasl.xml
==============================================================================
--- trunk/BOOK/postlfs/security/cyrus-sasl.xml	Wed Apr 16 07:12:15 2014	(r12959)
+++ trunk/BOOK/postlfs/security/cyrus-sasl.xml	Wed Apr 16 09:05:09 2014	(r12960)
@@ -101,7 +101,7 @@
     <para role="optional">
       <xref linkend="linux-pam"/>,
       <xref linkend="mitkrb"/>,
-      <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
+      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
       <xref linkend="openjdk"/>,
       <xref linkend="openldap"/>,
       <xref linkend="postgresql"/>,

Modified: trunk/BOOK/server/databases/databases.xml
==============================================================================
--- trunk/BOOK/server/databases/databases.xml	Wed Apr 16 07:12:15 2014	(r12959)
+++ trunk/BOOK/server/databases/databases.xml	Wed Apr 16 09:05:09 2014	(r12960)
@@ -23,7 +23,6 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="db.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mariadb.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="postgresql.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sqlite.xml"/>
 

Modified: trunk/BOOK/server/databases/mariadb.xml
==============================================================================
--- trunk/BOOK/server/databases/mariadb.xml	Wed Apr 16 07:12:15 2014	(r12959)
+++ trunk/BOOK/server/databases/mariadb.xml	Wed Apr 16 09:05:09 2014	(r12960)
@@ -6,10 +6,10 @@
 
   <!ENTITY mariadb-download-http "http://tweedo.com/mirror/mariadb/mariadb-&mariadb-version;/kvm-tarbake-jaunty-x86/mariadb-&mariadb-version;.tar.gz">
   <!ENTITY mariadb-download-ftp  "ftp://mirrors.fe.up.pt/pub/mariadb/mariadb-&mariadb-version;/kvm-tarbake-jaunty-x86/mariadb-&mariadb-version;.tar.gz">
-  <!ENTITY mariadb-md5sum        "36363eaaeace9e81a64ac94d9d53bffe">
+  <!ENTITY mariadb-md5sum        "14ce22b8197d4eae88d237776d47220f">
   <!ENTITY mariadb-size          "50 MB">
   <!ENTITY mariadb-buildsize     "1.2 GB">
-  <!ENTITY mariadb-time          "6.1 SBU (additional 0.4 SBU for the tests)">
+  <!ENTITY mariadb-time          "8.2 SBU (additional 0.4 SBU for the tests)">
 ]>
 
 <sect1 id="mariadb" xreflabel="MariaDB-&mariadb-version;">
@@ -71,6 +71,10 @@
       </listitem>
     </itemizedlist>
 
+    <note><para>The installed size of MariaDB is 297 MB, but this can be
+    reduced by about 160 MB, if desired, by removing the /usr/share/mysql/test
+    directory after installation.</para></note>
+
     <bridgehead renderas="sect3">MariaDB Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -107,16 +111,12 @@
   <sect2 role="installation">
     <title>Installation of MariaDB</title>
 
-    <note>
+    <warning>
       <para>
-        This version of <application>MariaDB</application> is a development
-        release. The BLFS staff has determined that it provides a stable program
-        and includes backported features from <application>MySQL</application>
-        5.6 and entirely new features not found anywhere else. To find the
-        current stable release, please refer to the <ulink
-        url="https://mariadb.org/">MariaDB home page</ulink>.
+        MariaDB and MySQL cannot be installed on the same system without 
+        extensive changes to the build configuration of one of the two applications.
       </para>
-    </note>
+    </warning>
 
     <para>
       For security reasons, running the server as an unprivileged user

Modified: trunk/BOOK/server/mail/dovecot.xml
==============================================================================
--- trunk/BOOK/server/mail/dovecot.xml	Wed Apr 16 07:12:15 2014	(r12959)
+++ trunk/BOOK/server/mail/dovecot.xml	Wed Apr 16 09:05:09 2014	(r12960)
@@ -84,7 +84,7 @@
       <xref linkend="linux-pam"/>,
       <xref linkend="openldap"/>,
       <xref linkend="postgresql"/>,
-      <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
+      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
       <xref linkend="sqlite"/>, and
       <xref linkend="clucene"/>
     </para>

Modified: trunk/BOOK/server/mail/exim.xml
==============================================================================
--- trunk/BOOK/server/mail/exim.xml	Wed Apr 16 07:12:15 2014	(r12959)
+++ trunk/BOOK/server/mail/exim.xml	Wed Apr 16 09:05:09 2014	(r12960)
@@ -82,7 +82,7 @@
       <xref linkend="openldap"/>,
       <xref linkend="openssl"/> or <xref linkend="gnutls"/>,
       <xref linkend="cyrus-sasl"/>,
-      <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
+      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
       <xref linkend="postgresql"/>,
       <xref linkend="sqlite"/>,
       <xref linkend="linux-pam"/>, and

Modified: trunk/BOOK/server/mail/postfix.xml
==============================================================================
--- trunk/BOOK/server/mail/postfix.xml	Wed Apr 16 07:12:15 2014	(r12959)
+++ trunk/BOOK/server/mail/postfix.xml	Wed Apr 16 09:05:09 2014	(r12960)
@@ -89,7 +89,7 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
+      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
       <xref linkend="openldap"/>,
       <xref linkend="pcre"/>,
       <xref linkend="postgresql"/>,

Modified: trunk/BOOK/server/major/bind.xml
==============================================================================
--- trunk/BOOK/server/major/bind.xml	Wed Apr 16 07:12:15 2014	(r12959)
+++ trunk/BOOK/server/major/bind.xml	Wed Apr 16 09:05:09 2014	(r12960)
@@ -81,7 +81,7 @@
     <bridgehead renderas="sect4">Optional database backends</bridgehead>
     <para role="optional">
       <xref linkend="postgresql"/>,
-      <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
+      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
       <xref linkend="db"/>,
       <xref linkend="openldap"/>, and
       <xref linkend="unixodbc"/>

Modified: trunk/BOOK/server/major/proftpd.xml
==============================================================================
--- trunk/BOOK/server/major/proftpd.xml	Wed Apr 16 07:12:15 2014	(r12959)
+++ trunk/BOOK/server/major/proftpd.xml	Wed Apr 16 09:05:09 2014	(r12960)
@@ -64,7 +64,7 @@
       <xref linkend="acl"/>,
       <xref linkend="libcap"/>,
       <xref linkend="linux-pam"/>,
-      <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
+      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
       <xref linkend="openssl"/>,
       <xref linkend="pcre"/>,
       <xref linkend="postgresql"/> and to run tests

Modified: trunk/BOOK/server/other/openldap.xml
==============================================================================
--- trunk/BOOK/server/other/openldap.xml	Wed Apr 16 07:12:15 2014	(r12959)
+++ trunk/BOOK/server/other/openldap.xml	Wed Apr 16 09:05:09 2014	(r12960)
@@ -108,8 +108,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="icu"/>,
-      <xref linkend="mariadb"/> or <xref linkend="mysql"/> or
-      <xref linkend="postgresql"/>,
+        <xref linkend="mariadb"/> or 
+        <ulink url="http://www.mysql.com/">MySQL</ulink> or
+        <xref linkend="postgresql"/>,
       <ulink url="http://www.openslp.org/">OpenSLP</ulink>,
       <xref linkend="pth"/> and
       <xref linkend="unixodbc"/>

Modified: trunk/BOOK/x/lib/qt4.xml
==============================================================================
--- trunk/BOOK/x/lib/qt4.xml	Wed Apr 16 07:12:15 2014	(r12959)
+++ trunk/BOOK/x/lib/qt4.xml	Wed Apr 16 09:05:09 2014	(r12960)
@@ -103,7 +103,7 @@
       <xref linkend="cups"/>,
       <xref linkend="gtk2"/> (GTK+ 2 theme support),
       <xref linkend="gst-plugins-base"/> (For QtWebKit HTML5 Video),
-      <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
+      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
       <xref linkend="postgresql"/>,
       <xref linkend="pulseaudio"/>, and
       <xref linkend="unixodbc"/>

Modified: trunk/BOOK/x/lib/qt5.xml
==============================================================================
--- trunk/BOOK/x/lib/qt5.xml	Wed Apr 16 07:12:15 2014	(r12959)
+++ trunk/BOOK/x/lib/qt5.xml	Wed Apr 16 09:05:09 2014	(r12960)
@@ -115,7 +115,7 @@
       <xref linkend="gtk2"/> (GTK+ Theme Support),
       <ulink url="https://code.google.com/p/ibus/">IBus</ulink>,
       <ulink url="http://xkbcommon.org/">libxkbcommon</ulink>,
-      <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
+      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
       <xref linkend="postgresql"/>,
       <xref linkend="pulseaudio"/>, and 
       <xref linkend="unixodbc"/>

Modified: trunk/BOOK/xsoft/office/libreoffice.xml
==============================================================================
--- trunk/BOOK/xsoft/office/libreoffice.xml	Wed Apr 16 07:12:15 2014	(r12959)
+++ trunk/BOOK/xsoft/office/libreoffice.xml	Wed Apr 16 09:05:09 2014	(r12960)
@@ -210,7 +210,7 @@
       <ulink url="http://sourceforge.net/projects/libwpd/files/libodfgen/">libodfgen</ulink>,
       <ulink url="http://hci.iwr.uni-heidelberg.de/vigra/">VIGRA</ulink>,
       <ulink url="http://code.google.com/p/multidimalgorithm/">mdds</ulink>,
-      <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
+      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
       <ulink url="http://sourceforge.net/projects/hunspell/files/MyThes/">MyThes</ulink>,
       <ulink url="https://gitorious.org/orcus">Orcus</ulink>,
       <xref linkend="postgresql"/>,



More information about the blfs-book mailing list