Changeset 2aeb916


Ignore:
Timestamp:
06/19/2017 08:40:16 PM (6 years ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, ken/inkscape-core-mods, lazarus, perl-modules, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226
Children:
d651fca
Parents:
1bdcde9
Message:

Update to mariadb-10.2.6

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@18835 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
4 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    r1bdcde9 r2aeb916  
    11<!-- $LastChangedBy$ $Date$ -->
    22
    3 <!ENTITY day          "18">                   <!-- Always 2 digits -->
     3<!ENTITY day          "19">                   <!-- Always 2 digits -->
    44<!ENTITY month        "06">                   <!-- Always 2 digits -->
    55<!ENTITY year         "2017">
    … …  
    77<!ENTITY copyholder   "The BLFS Development Team">
    88<!ENTITY version      "&year;-&month;-&day;">
    9 <!ENTITY releasedate  "June 18th &year;">
     9<!ENTITY releasedate  "June 19th &year;">
    1010<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
    1111<!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

  • general/prog/perl-modules.xml

    r1bdcde9 r2aeb916  
    9090  <!ENTITY Net-DNS-md5sum "4fa45b0dfe79667453c1553e16e52c2a">
    9191
    92   <!ENTITY Parse-Yapp-download-http "http://www.cpan.org/authors/id/F/FD/FDESAR/Parse-Yapp-&Parse-Yapp-version;.tar.gz">
     92  <!ENTITY Parse-Yapp-download-http "http://www.cpan.org/authors/id/W/WB/WBRASWELL/Parse-Yapp-&Parse-Yapp-version;.tar.gz">
    9393  <!ENTITY Parse-Yapp-md5sum "845d603ad41e720c251d42cfc9d5223d">
    9494

  • introduction/welcome/changelog.xml

    r1bdcde9 r2aeb916  
    4343-->
    4444    <listitem>
     45      <para>June 19th, 2017</para>
     46      <itemizedlist>
     47        <listitem>
     48          <para>[bdubbs] - Update to mariadb-10.2.6. Fixes
     49          <ulink url="&blfs-ticket-root;9269">#9269</ulink>.</para>
     50        </listitem>
     51      </itemizedlist>
     52    </listitem>
     53
     54    <listitem>
    4555      <para>June 18th, 2017</para>
    4656      <itemizedlist>

  • server/databases/mariadb.xml

    r1bdcde9 r2aeb916  
    1010  <!ENTITY mariadb-download-http " ">
    1111  <!ENTITY mariadb-download-ftp  "ftp://mirrors.fe.up.pt/pub/mariadb/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz">
    12   <!ENTITY mariadb-md5sum        "1a7392cc05c7c249acd4495022719ca8">
    13   <!ENTITY mariadb-size          "59 MB">
    14   <!ENTITY mariadb-buildsize     "1.2 GB (with tests)">
    15   <!ENTITY mariadb-time          "6.4 SBU, (with parallelism=4 and tests)">
     12  <!ENTITY mariadb-md5sum        "3d454cdadbd3208e1c9c23e5338a62b0">
     13  <!ENTITY mariadb-size          "64 MB">
     14  <!ENTITY mariadb-buildsize     "1.3 GB">
     15  <!ENTITY mariadb-time          "8.0 SBU (with parallelism=4, add 0.5 SBU for tests)">
    1616]>
    1717
    … …  
    4040
    4141    &lfs80_checked;
     42    &gcc7_checked;
    4243
    4344    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    7576    </itemizedlist>
    7677
    77     <note><para>The installed size of MariaDB is 422 MB, but this can be
    78     reduced by about 177 MB, if desired, by removing the /usr/share/mysql/test
     78    <note><para>The installed size of MariaDB is 473 MB, but this can be
     79    reduced by about 200 MB, if desired, by removing the /usr/share/mysql/test
    7980    directory after installation.</para></note>
    80 
    81     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    82     <itemizedlist spacing="compact">
    83       <listitem>
    84         <para>Required patch: <ulink url="&patch-root;/mariadb-&mariadb-version;-openssl-1.1.0-1.patch"/></para>
    85       </listitem>
    86     </itemizedlist>
    8781
    8882    <bridgehead renderas="sect3">MariaDB Dependencies</bridgehead>
    … …  
    153147    </para>
    154148
    155 <screen><userinput>patch -Np1 -i ../mariadb-&mariadb-version;-openssl-1.1.0-1.patch   &amp;&amp;
    156 sed -i "s@data/test@\${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt &amp;&amp;
     149<screen><userinput>sed -i "s@data/test@\${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt &amp;&amp;
    157150
    158151mkdir build &amp;&amp;
    159152cd build    &amp;&amp;
    160153
    161 cmake -DCMAKE_BUILD_TYPE=Release                       \
    162       -DCMAKE_INSTALL_PREFIX=/usr                      \
     154cmake -DCMAKE_BUILD_TYPE=Release                      \
     155      -DCMAKE_INSTALL_PREFIX=/usr                     \
    163156      -DINSTALL_DOCDIR=share/doc/mariadb-&mariadb-version;       \
    164157      -DINSTALL_DOCREADMEDIR=share/doc/mariadb-&mariadb-version; \
    165       -DINSTALL_MANDIR=share/man                       \
    166       -DINSTALL_MYSQLSHAREDIR=share/mysql              \
    167       -DINSTALL_MYSQLTESTDIR=share/mysql/test          \
    168       -DINSTALL_PLUGINDIR=lib/mysql/plugin             \
    169       -DINSTALL_SBINDIR=sbin                           \
    170       -DINSTALL_SCRIPTDIR=bin                          \
    171       -DINSTALL_SQLBENCHDIR=share/mysql/bench          \
    172       -DINSTALL_SUPPORTFILESDIR=share/mysql            \
    173       -DMYSQL_DATADIR=/srv/mysql                       \
    174       -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock        \
    175       -DWITH_EXTRA_CHARSETS=complex                    \
    176       -DWITH_EMBEDDED_SERVER=ON                        \
    177       -DTOKUDB_OK=0                                    \
     158      -DINSTALL_MANDIR=share/man                      \
     159      -DINSTALL_MYSQLSHAREDIR=share/mysql             \
     160      -DINSTALL_MYSQLTESTDIR=share/mysql/test         \
     161      -DINSTALL_PLUGINDIR=lib/mysql/plugin            \
     162      -DINSTALL_SBINDIR=sbin                          \
     163      -DINSTALL_SCRIPTDIR=bin                         \
     164      -DINSTALL_SQLBENCHDIR=share/mysql/bench         \
     165      -DINSTALL_SUPPORTFILESDIR=share/mysql           \
     166      -DMYSQL_DATADIR=/srv/mysql                      \
     167      -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock       \
     168      -DWITH_EXTRA_CHARSETS=complex                   \
     169      -DWITH_EMBEDDED_SERVER=ON                       \
     170      -DSKIP_TESTS=ON                                 \
     171      -DTOKUDB_OK=0                                   \
    178172      .. &amp;&amp;
    179173make</userinput></screen>
    … …  
    182176      To test the results, issue: <command>make test</command>.
    183177    </para>
     178
     179    <note><para>
     180      A more extensive set of tests can be run with the following:</para>
     181
     182<screen><userinput>pushd mysql-test
     183./mtr --parallel &lt;N&gt; --mem --force
     184popd</userinput></screen>
     185
     186    <para>
     187      Where N is the number of tests to run in parallel. A little
     188      over 3700 tests are fun in about 14 SBU with N=4.  Three tests
     189      are known to fail due to character set issues. 
     190    </para></note>
    184191
    185192    <para>
    … …  
    210217    </para>
    211218
    212     <!-- Manually-specified variables were not used by the project: WITH_LIBEVENT
    213     <para>
    214       <parameter>-DWITH_LIBEVENT=system</parameter>: This switch is used to
    215       tell the build system to use installed <application>libevent</application>.
    216       Remove it if you didn't install <application>libevent</application>.
    217     </para> -->
    218 
    219     <para>
    220       <option>-DWITHOUT_SERVER=ON -DWITH_UNIT_TESTS=OFF</option>: Use these
     219    <para>
     220      <parameter>-DKIP_TESTS=ON</parameter>: This switch disables
     221      tests for MariaDB Connector/C which are not supored without
     222      additional setup.
     223    </para>
     224
     225    <para>
     226      <option>-DWITHOUT_SERVER=ON</option>: Use these
    221227      switches if you don't want the server and would like to build the client
    222228      only.
Note: See TracChangeset for help on using the changeset viewer.