Changeset de61ab1 for server/databases/mariadb.xml

Timestamp:

08/27/2024 08:03:55 AM (7 weeks ago)

Author:

Thomas Trepl <thomas@…>

Branches:

lazarus

Children:

53d0e62a

Parents:

7d55a6a (diff), c36ca685 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge trunk

File:

• server/databases/mariadb.xml (modified) (7 diffs)

server/databases/mariadb.xml

@@ -8 +8 @@
   <!ENTITY mariadb-download-http "https://downloads.mariadb.org/interstitial/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz">
   <!ENTITY mariadb-download-ftp  " ">
-  <!ENTITY mariadb-md5sum        "904693e6fb92aa8804a6cb161441b474">
+  <!ENTITY mariadb-md5sum        "ba7abfae7947893c5a5343180808b0cb">
   <!ENTITY mariadb-size          "96 MB">
   <!ENTITY mariadb-buildsize     "1.9 GB (415 MB installed)">
-  <!ENTITY mariadb-time          "8.7 SBU (with parallelism=4, add 0.3 SBU for tests)">
+  <!ENTITY mariadb-time          "4.8 SBU (with parallelism=8, add 0.3 SBU for tests)">
 ]>
 
@@ -71 +71 @@
     <note>
       <para>
-        The installed size of MariaDB is 723 MB, but this can be
-        reduced by about 262 MB, if desired, by removing the <filename
+        The installed size of MariaDB is 725 MB, but this can be
+        reduced by about 265 MB, if desired, by removing the <filename
         class="directory">/usr/share/mysql/test</filename>
         directory after installation.
@@ -162 +162 @@
 cd    build &amp;&amp;
 
-cmake -DCMAKE_BUILD_TYPE=Release                       \
-      -DCMAKE_INSTALL_PREFIX=/usr                      \
-      -DGRN_LOG_PATH=/var/log/groonga.log              \
-      -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_PAMDIR=lib/security                    \
-      -DINSTALL_PAMDATADIR=/etc/security               \
-      -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                                    \
+cmake -D CMAKE_BUILD_TYPE=Release                       \
+      -D CMAKE_INSTALL_PREFIX=/usr                      \
+      -D GRN_LOG_PATH=/var/log/groonga.log              \
+      -D INSTALL_DOCDIR=share/doc/mariadb-&mariadb-version;       \
+      -D INSTALL_DOCREADMEDIR=share/doc/mariadb-&mariadb-version; \
+      -D INSTALL_MANDIR=share/man                       \
+      -D INSTALL_MYSQLSHAREDIR=share/mysql              \
+      -D INSTALL_MYSQLTESTDIR=share/mysql/test          \
+      -D INSTALL_PAMDIR=lib/security                    \
+      -D INSTALL_PAMDATADIR=/etc/security               \
+      -D INSTALL_PLUGINDIR=lib/mysql/plugin             \
+      -D INSTALL_SBINDIR=sbin                           \
+      -D INSTALL_SCRIPTDIR=bin                          \
+      -D INSTALL_SQLBENCHDIR=share/mysql/bench          \
+      -D INSTALL_SUPPORTFILESDIR=share/mysql            \
+      -D MYSQL_DATADIR=/srv/mysql                       \
+      -D MYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock        \
+      -D WITH_EXTRA_CHARSETS=complex                    \
+      -D WITH_EMBEDDED_SERVER=ON                        \
+      -D SKIP_TESTS=ON                                  \
+      -D TOKUDB_OK=0                                    \
       .. &amp;&amp;
 make</userinput></screen>
@@ -225 +225 @@
 
     <para>
-      <parameter>-DWITH_EMBEDDED_SERVER=ON</parameter>: This switch enables
+      <parameter>-D WITH_EMBEDDED_SERVER=ON</parameter>: This switch enables
       compiling the embedded server library needed by certain applications,
       such as <application>Amarok</application>.
@@ -231 +231 @@
 
     <para>
-      <parameter>-DWITH_EXTRA_CHARSETS=complex</parameter>: This switch enables
+      <parameter>-D WITH_EXTRA_CHARSETS=complex</parameter>: This switch enables
       support for the complex character sets.
     </para>
 
     <para>
-      <parameter>-DSKIP_TESTS=ON</parameter>: This switch disables
+      <parameter>-D SKIP_TESTS=ON</parameter>: This switch disables
       tests for MariaDB Connector/C which are not supported without
       additional setup.
@@ -242 +242 @@
 
     <para>
-      <option>-DWITHOUT_SERVER=ON</option>: Use this
+      <option>-D WITHOUT_SERVER=ON</option>: Use this
       switch if you don't want the server and would like to build the client
       only.
@@ -280 +280 @@
 
       <para>
-        Create basic <filename>/etc/mysql/my.cnf</filename>
-        using the following command as the <systemitem
+        Create a basic <filename>/etc/mysql/my.cnf</filename>
+        file using the following command as the <systemitem
         class="username">root</systemitem> user:
       </para>