Index: general.ent
===================================================================
--- general.ent	(revision 1bdcde9f3ebba88b8c9121c72fa1e53cca4f833f)
+++ general.ent	(revision 2aeb916d33d6067c497414a626a0d64128216933)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "18">                   <!-- Always 2 digits -->
+<!ENTITY day          "19">                   <!-- Always 2 digits -->
 <!ENTITY month        "06">                   <!-- Always 2 digits -->
 <!ENTITY year         "2017">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "June 18th &year;">
+<!ENTITY releasedate  "June 19th &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: general/prog/perl-modules.xml
===================================================================
--- general/prog/perl-modules.xml	(revision 1bdcde9f3ebba88b8c9121c72fa1e53cca4f833f)
+++ general/prog/perl-modules.xml	(revision 2aeb916d33d6067c497414a626a0d64128216933)
@@ -90,5 +90,5 @@
   <!ENTITY Net-DNS-md5sum "4fa45b0dfe79667453c1553e16e52c2a">
 
-  <!ENTITY Parse-Yapp-download-http "http://www.cpan.org/authors/id/F/FD/FDESAR/Parse-Yapp-&Parse-Yapp-version;.tar.gz">
+  <!ENTITY Parse-Yapp-download-http "http://www.cpan.org/authors/id/W/WB/WBRASWELL/Parse-Yapp-&Parse-Yapp-version;.tar.gz">
   <!ENTITY Parse-Yapp-md5sum "845d603ad41e720c251d42cfc9d5223d">
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 1bdcde9f3ebba88b8c9121c72fa1e53cca4f833f)
+++ introduction/welcome/changelog.xml	(revision 2aeb916d33d6067c497414a626a0d64128216933)
@@ -43,4 +43,14 @@
 -->
     <listitem>
+      <para>June 19th, 2017</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to mariadb-10.2.6. Fixes
+          <ulink url="&blfs-ticket-root;9269">#9269</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>June 18th, 2017</para>
       <itemizedlist>
Index: server/databases/mariadb.xml
===================================================================
--- server/databases/mariadb.xml	(revision 1bdcde9f3ebba88b8c9121c72fa1e53cca4f833f)
+++ server/databases/mariadb.xml	(revision 2aeb916d33d6067c497414a626a0d64128216933)
@@ -10,8 +10,8 @@
   <!ENTITY mariadb-download-http " ">
   <!ENTITY mariadb-download-ftp  "ftp://mirrors.fe.up.pt/pub/mariadb/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz">
-  <!ENTITY mariadb-md5sum        "1a7392cc05c7c249acd4495022719ca8">
-  <!ENTITY mariadb-size          "59 MB">
-  <!ENTITY mariadb-buildsize     "1.2 GB (with tests)">
-  <!ENTITY mariadb-time          "6.4 SBU, (with parallelism=4 and tests)">
+  <!ENTITY mariadb-md5sum        "3d454cdadbd3208e1c9c23e5338a62b0">
+  <!ENTITY mariadb-size          "64 MB">
+  <!ENTITY mariadb-buildsize     "1.3 GB">
+  <!ENTITY mariadb-time          "8.0 SBU (with parallelism=4, add 0.5 SBU for tests)">
 ]>
 
@@ -40,4 +40,5 @@
 
     &lfs80_checked;
+    &gcc7_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -75,14 +76,7 @@
     </itemizedlist>
 
-    <note><para>The installed size of MariaDB is 422 MB, but this can be
-    reduced by about 177 MB, if desired, by removing the /usr/share/mysql/test
+    <note><para>The installed size of MariaDB is 473 MB, but this can be
+    reduced by about 200 MB, if desired, by removing the /usr/share/mysql/test
     directory after installation.</para></note>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch: <ulink url="&patch-root;/mariadb-&mariadb-version;-openssl-1.1.0-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
 
     <bridgehead renderas="sect3">MariaDB Dependencies</bridgehead>
@@ -153,27 +147,27 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../mariadb-&mariadb-version;-openssl-1.1.0-1.patch   &amp;&amp;
-sed -i "s@data/test@\${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt &amp;&amp;
+<screen><userinput>sed -i "s@data/test@\${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt &amp;&amp;
 
 mkdir build &amp;&amp;
 cd build    &amp;&amp;
 
-cmake -DCMAKE_BUILD_TYPE=Release                       \
-      -DCMAKE_INSTALL_PREFIX=/usr                      \
+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                                    \
+      -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                       \
+      -DSKIP_TESTS=ON                                 \
+      -DTOKUDB_OK=0                                   \
       .. &amp;&amp;
 make</userinput></screen>
@@ -182,4 +176,17 @@
       To test the results, issue: <command>make test</command>.
     </para>
+
+    <note><para>
+      A more extensive set of tests can be run with the following:</para>
+
+<screen><userinput>pushd mysql-test
+./mtr --parallel &lt;N&gt; --mem --force
+popd</userinput></screen>
+
+    <para>
+      Where N is the number of tests to run in parallel. A little
+      over 3700 tests are fun in about 14 SBU with N=4.  Three tests 
+      are known to fail due to character set issues.  
+    </para></note>
 
     <para>
@@ -210,13 +217,12 @@
     </para>
 
-    <!-- Manually-specified variables were not used by the project: WITH_LIBEVENT
-    <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>
-      <option>-DWITHOUT_SERVER=ON -DWITH_UNIT_TESTS=OFF</option>: Use these
+    <para>
+      <parameter>-DKIP_TESTS=ON</parameter>: This switch disables
+      tests for MariaDB Connector/C which are not supored without 
+      additional setup.
+    </para>
+
+    <para>
+      <option>-DWITHOUT_SERVER=ON</option>: Use these
       switches if you don't want the server and would like to build the client
       only.
