Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 92d18a9666f2ea1e4724a0dfed1459fa7cff9ab7)
+++ introduction/welcome/changelog.xml	(revision cc852ff066d40b2ecd6d2bbddede4e4ee09c271c)
@@ -46,4 +46,8 @@
       <itemizedlist>
         <listitem>
+          <para>[renodr] - Update to mariadb-10.5.7 (Security Update). Fixes
+          <ulink url="&blfs-ticket-root;14210">#14210</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to iptables-1.8.6. Fixes
           <ulink url="&blfs-ticket-root;14195">#14195</ulink>.</para>
Index: packages.ent
===================================================================
--- packages.ent	(revision 92d18a9666f2ea1e4724a0dfed1459fa7cff9ab7)
+++ packages.ent	(revision cc852ff066d40b2ecd6d2bbddede4e4ee09c271c)
@@ -666,5 +666,5 @@
 <!ENTITY db-version                   "5.3.28">
 <!ENTITY lmdb-version                 "0.9.24">
-<!ENTITY mariadb-version              "10.5.6">
+<!ENTITY mariadb-version              "10.5.7">
 <!ENTITY postgresql-version           "13.0">
 <!ENTITY sqlite-version               "3.33.0">
Index: server/databases/mariadb.xml
===================================================================
--- server/databases/mariadb.xml	(revision 92d18a9666f2ea1e4724a0dfed1459fa7cff9ab7)
+++ server/databases/mariadb.xml	(revision cc852ff066d40b2ecd6d2bbddede4e4ee09c271c)
@@ -8,8 +8,8 @@
   <!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        "add57692b7a6888c3ffb304222e2cb80">
-  <!ENTITY mariadb-size          "83 MB">
-  <!ENTITY mariadb-buildsize     "2.3 GB (639 MB installed)">
-  <!ENTITY mariadb-time          "7.0 SBU (with parallelism=4, add 0.5 SBU for tests)">
+  <!ENTITY mariadb-md5sum        "c575ce49b839ba2d665203a97430bafa">
+  <!ENTITY mariadb-size          "84 MB">
+  <!ENTITY mariadb-buildsize     "2.3 GB (644 MB installed)">
+  <!ENTITY mariadb-time          "8.6 SBU (with parallelism=4, add 0.3 SBU for tests)">
 ]>
 
@@ -75,6 +75,6 @@
     <note>
       <para>
-        The installed size of MariaDB is 473 MB, but this can be
-        reduced by about 200 MB, if desired, by removing the <filename
+        The installed size of MariaDB is 644 MB, but this can be
+        reduced by about 244 MB, if desired, by removing the <filename
         class="directory">/usr/share/mysql/test</filename>
         directory after installation.
@@ -412,18 +412,20 @@
         <seg>
           aria_chk, aria_dump_log, aria_ftdump, aria_pack, aria_read_log,
-          innochecksum, mariabackup, mariadb_config, mbstream, msql2mysql,
-          my_print_defaults, myisamchk,
-          myisam_ftdump, myisamchk, myisamlog, myisampack, mysql,
-          mysql_client_test, mysql_client_test_embedded, mysql_config,
-          mysql_convert_table_format, mysql_embedded, mysql_find_rows,
-          mysql_fix_extensions, mysql_install_db, mysql_ldb, mysql_plugin,
-          mysql_secure_installation, mysql_setpermission, mysql_tzinfo_to_sql,
-          mysql_upgrade, mysql_waitpid, mysqlaccess, mysqladmin, mysqlbinlog,
-          mysqlcheck, mysqld, mysqld_multi, mysqld_safe, mysqld_safe_helper,
-          mysqldump, mysqldumpslow, mysqlhotcopy, mysqlimport, mysqlshow,
-          mysqlslap, mysqltest, mysqltest_embedded, mytop, perror, replace,
-          resolve_stack_dump, resolveip, sst_dump, wsrep_sst_common,
-          wsrep_sst_mariabackup, wsrep_sst_mysqldump,
-          wsrep_sst_rsync, wsrep_sst_xtrabackup, and wsrep_sst_xtrabackup-v2
+          aria_s3_copy, galera_new_cluster, galera_recovery,
+          innochecksum, mariabackup, mariadb, mariadbd, mariadb-access,
+          mariadb-admin, mariadb-binlog, mariadb-check, mariadb-client-test,
+          mariadb-client-test-embedded, mariadb-conv,
+          mariadb-convert-table-format, mariadbd-multi, mariadbd-safe,
+          mariadbd-safe-helper, mariadb-dump, mariadb-dumpslow,
+          mariadb-embedded, mariadb-fix-extensions, mariadb-hotcopy,
+          mariadb-import, mariadb-install-db, mariadb-ldb, mariadb-plugin,
+          mariadb-secure-installation, mariadb-setpermission, mariadb-show,
+          mariadb-slap, mariadb-test, mariadb-test-embedded,
+          mariadb-tzinfo-to-sql, mariadb-upgrade, mariadb-waitpid,
+          mariadb_config, 
+          mbstream, msql2mysql, my_print_defaults, myisamchk,
+          myisam_ftdump, myisamlog, myisampack, mysql_config, mytop, perror, 
+          replace, resolve_stack_dump, resolveip, sst_dump, wsrep_sst_common,
+          wsrep_sst_mariabackup, wsrep_sst_mysqldump, and wsrep_sst_rsync
         </seg>
         <seg>
@@ -443,4 +445,9 @@
     <bridgehead renderas="sect3">Short Descriptions</bridgehead>
 
+    <para>
+      There are several symlinks from mysql* to their mariadb
+      counterparts. These are maintained for compatibility.
+    </para>
+
 <!--
     <para>
@@ -523,4 +530,40 @@
       </varlistentry>
 
+      <varlistentry id="aria_s3_copy-mariadb">
+        <term><command>aria_s3_copy</command></term>
+        <listitem>
+          <para>
+            copies an aria table to and from AWS S3.
+          </para>
+          <indexterm zone="mariadb aria_s3_copy-mariadb">
+            <primary sortas="b-aria_s3_copy-mariadb">aria_s3_copy</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="galera_new_cluster-mariadb">
+         <term><command>galera_new_cluster</command></term>
+         <listitem>
+           <para>
+             bootstraps a new Galera cluster.
+           </para>
+           <indexterm zone="mariadb galera_new_cluster-mariadb">
+             <primary sortas="b-galera_new_cluster-mariadb">galera_new_cluster</primary>
+           </indexterm>
+         </listitem>
+      </varlistentry>
+
+      <varlistentry id="galera_recovery-mariadb">
+        <term><command>galera_recovery</command></term>
+        <listitem>
+          <para>
+            recovers data from a Galera cluster.
+          </para>
+          <indexterm zone="mariadb galera_recovery-mariadb">
+             <primary sortas="b-galera_recovery-mariadb">galera_recovery</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="innochecksum-mariadb">
         <term><command>innochecksum</command></term>
@@ -547,129 +590,80 @@
       </varlistentry>
 
-      <varlistentry id="mariadb_config-mariadb">
-        <term><command>mariadb_config</command></term>
-        <listitem>
-          <para>
-            gets compiler flags for using the MariaDB Connector/C.
-          </para>
-          <indexterm zone="mariadb mariadb_config-mariadb">
-            <primary sortas="b-mariadb_config-mariadb">mariadb_config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mbstream-mariadb">
-        <term><command>mbstream</command></term>
-        <listitem>
-          <para>
-            is an utility for sending InnoDB and XTraDB backups over a stream
-          </para>
-          <indexterm zone="mariadb mbstream-mariadb">
-            <primary sortas="b-mbstream-mariadb">mbstream</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-<!--
-      <varlistentry id="maria_add_gis_sp.sql-mariadb">
-        <term><command>maria_add_gis_sp.sql</command></term>
-        <listitem>
-          <para>
-            this script creates stored procedures required by the OpenGIS
-            standards, and is prepared to be run with the -\-bootstrap server
-            option.
-          </para>
-          <indexterm zone="mariadb maria_add_gis_sp.sql-mariadb">
-            <primary sortas="b-maria_add_gis_sp.sql-mariadb">maria_add_gis_sp.sql</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-      <varlistentry id="msql2mysql-mariadb">
-        <term><command>msql2mysql</command></term>
-        <listitem>
-          <para>
-            is a tool to convert mSQL programs for use with MySQL.
-          </para>
-          <indexterm zone="mariadb msql2mysql-mariadb">
-            <primary sortas="b-msql2mysql-mariadb">msql2mysql</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="my_print_defaults-mariadb">
-        <term><command>my_print_defaults</command></term>
-        <listitem>
-          <para>
-            displays the options from option groups of option files.
-          </para>
-          <indexterm zone="mariadb my_print_defaults-mariadb">
-            <primary sortas="b-my_print_defaults-mariadb">my_print_defaults</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="myisam_ftdump-mariadb">
-        <term><command>myisam_ftdump</command></term>
-        <listitem>
-          <para>
-            displays information about FULLTEXT indexes in MyISAM tables.
-          </para>
-          <indexterm zone="mariadb myisam_ftdump-mariadb">
-            <primary sortas="b-myisam_ftdump-mariadb">myisam_ftdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="myisamchk-mariadb">
-        <term><command>myisamchk</command></term>
-        <listitem>
-          <para>
-            gets information about your database tables or checks, repairs,
-            or optimizes them.
-          </para>
-          <indexterm zone="mariadb myisamchk-mariadb">
-            <primary sortas="b-myisamchk-mariadb">myisamchk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="myisamlog-mariadb">
-        <term><command>myisamlog</command></term>
-        <listitem>
-          <para>
-            displays MyISAM log file contents.
-          </para>
-          <indexterm zone="mariadb myisamlog-mariadb">
-            <primary sortas="b-myisamlog-mariadb">myisamlog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="myisampack-mariadb">
-        <term><command>myisampack</command></term>
-        <listitem>
-          <para>
-            is a tool for compressing MyISAM tables.
-          </para>
-          <indexterm zone="mariadb myisampack-mariadb">
-            <primary sortas="b-myisampack-mariadb">myisampack</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysql-mariadb">
-        <term><command>mysql</command></term>
+      <varlistentry id="mariadb-mariadb">
+        <term><command>mariadb</command></term>
         <listitem>
           <para>
              is a simple SQL shell with input line editing capabilities.
           </para>
-          <indexterm zone="mariadb mysql-mariadb">
-            <primary sortas="b-mysql-mariadb">mysql</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysql_client_test-mariadb">
-        <term><command>mysql_client_test</command></term>
+          <indexterm zone="mariadb mariadb-mariadb">
+            <primary sortas="b-mariadb-mariadb">mariadb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadbd-mariadb">
+        <term><command>mariadbd</command></term>
+        <listitem>
+          <para>
+            is the MySQL server daemon.
+          </para>
+          <indexterm zone="mariadb mariadbd-mariadb">
+            <primary sortas="b-mariadbd-mariadb">mariadbd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadb-access-mariadb">
+        <term><command>mariadb-access</command></term>
+        <listitem>
+          <para>
+            checks the access privileges for a host name, user name, and
+            database combination.
+          </para>
+          <indexterm zone="mariadb mariadb-access-mariadb">
+            <primary sortas="b-mariadb-access-mariadb">mariadb-access</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadb-admin-mariadb">
+        <term><command>mariadb-admin</command></term>
+        <listitem>
+          <para>
+            is a client for performing administrative operations.
+          </para>
+          <indexterm zone="mariadb mariadb-admin-mariadb">
+            <primary sortas="b-mariadb-admin-mariadb">mariadb-admin</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadb-binlog-mariadb">
+        <term><command>mariadb-binlog</command></term>
+        <listitem>
+          <para>
+            read binary log files.
+          </para>
+          <indexterm zone="mariadb mariadb-binlog-mariadb">
+            <primary sortas="b-mariadb-binlog-mariadb">mariadb-binlog</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadb-check-mariadb">
+        <term><command>mariadb-check</command></term>
+        <listitem>
+          <para>
+            performs table maintenance: It checks, repairs, optimizes,
+            or analyzes tables.
+          </para>
+          <indexterm zone="mariadb mariadb-check-mariadb">
+            <primary sortas="b-mariadb-check-mariadb">mariadb-check</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadb-client-test-mariadb">
+        <term><command>mariadb-client-test</command></term>
         <listitem>
           <para>
@@ -677,37 +671,36 @@
             tested using mysqltest and its test language.
           </para>
-          <indexterm zone="mariadb mysql_client_test-mariadb">
-            <primary sortas="b-mysql_client_test-mariadb">mysql_client_test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysql_client_test_embedded-mariadb">
-        <term><command>mysql_client_test_embedded</command></term>
+          <indexterm zone="mariadb mariadb-client-test-mariadb">
+            <primary sortas="b-mariadb-client-test-mariadb">mariadb-client-test</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadb-client-test-embedded-mariadb">
+        <term><command>mariadb-client-test-embedded</command></term>
         <listitem>
           <para>
             is a tool to test client API for embedded server.
           </para>
-          <indexterm zone="mariadb mysql_client_test_embedded-mariadb">
-            <primary sortas="b-mysql_client_test_embedded-mariadb">mysql_client_test_embedded</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysql_config-mariadb">
-        <term><command>mysql_config</command></term>
-        <listitem>
-          <para>
-            provides you with useful information for compiling your MySQL
-            client and connecting it to MySQL.
-          </para>
-          <indexterm zone="mariadb mysql_config-mariadb">
-            <primary sortas="b-mysql_config-mariadb">mysql_config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysql_convert_table_format-mariadb">
-        <term><command>mysql_convert_table_format</command></term>
+          <indexterm zone="mariadb mariadb-client-test-embedded-mariadb">
+            <primary sortas="b-mariadb-client-test-embedded-mariadb">mariadb-client-test-embedded</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadb-conv-mariadb">
+        <term><command>mariadb-conv</command></term>
+        <listitem>
+          <para>
+            converts character sets for use with MariaDB.
+          </para>
+          <indexterm zone="mariadb mariadb-conv-mariadb">
+            <primary sortas="b-mariadb-conv-mariadb">mariadb-conv</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadb-convert-table-format-mariadb">
+        <term><command>mariadb-convert-table-format</command></term>
         <listitem>
           <para>
@@ -715,25 +708,76 @@
             engine.
           </para>
-          <indexterm zone="mariadb mysql_convert_table_format-mariadb">
-            <primary sortas="b-mysql_convert_table_format-mariadb">mysql_convert_table_format</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysql_embedded-mariadb">
-        <term><command>mysql_embedded</command></term>
+          <indexterm zone="mariadb mariadb-convert-table-format-mariadb">
+            <primary sortas="b-mariadb-convert-table-format-mariadb">mariadb-convert-table-format</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadbd-multi-mariadb">
+        <term><command>mariadbd-multi</command></term>
+        <listitem>
+          <para>
+            is designed to manage several mysqld processes that listen for
+            connections on different Unix socket files and TCP/IP ports.
+          </para>
+          <indexterm zone="mariadb mariadbd-multi-mariadb">
+            <primary sortas="b-mariadbd-multi-mariadb">mariadbd-multi</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadbd-safe-mariadb">
+        <term><command>mariadbd-safe</command></term>
+        <listitem>
+          <para>
+             is the recommended way to start a mysqld server on Unix
+             and NetWare.
+          </para>
+          <indexterm zone="mariadb mariadbd-safe-mariadb">
+            <primary sortas="b-mariadbd-safe-mariadb">mariadbd-safe</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadb-dump-mariadb">
+        <term><command>mariadb-dump</command></term>
+        <listitem>
+          <para>
+            is a backup program.
+          </para>
+          <indexterm zone="mariadb mariadb-dump-mariadb">
+            <primary sortas="b-mariadb-dump-mariadb">mariadb-dump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadb-dumpslow-mariadb">
+        <term><command>mariadb-dumpslow</command></term>
+        <listitem>
+          <para>
+            parses MySQL slow query log files and prints a summary of their
+            contents.
+          </para>
+          <indexterm zone="mariadb mariadb-dumpslow-mariadb">
+            <primary sortas="b-mariadb-dumpslow-mariadb">mariadb-dumpslow</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="mariadb-embedded-mariadb">
+        <term><command>mariadb-embedded</command></term>
         <listitem>
           <para>
             is a MySQL client statically linked to
-            libmysqld.
-          </para>
-          <indexterm zone="mariadb mysql_embedded-mariadb">
-            <primary sortas="b-mysql_embedded-mariadb">mysql_embedded</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysql_find_rows-mariadb">
-        <term><command>mysql_find_rows</command></term>
+            libmariadbd.
+          </para>
+          <indexterm zone="mariadb mariadb-embedded-mariadb">
+            <primary sortas="b-mariadbd-embedded-mariadb">mariadbd-embedded</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadb-find-rows-mariadb">
+        <term><command>mariadb-find-rows</command></term>
         <listitem>
           <para>
@@ -742,25 +786,51 @@
             SET statements.
           </para>
-          <indexterm zone="mariadb mysql_find_rows-mariadb">
-            <primary sortas="b-mysql_find_rows-mariadb">mysql_find_rows</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysql_fix_extensions-mariadb">
-        <term><command>mysql_fix_extensions</command></term>
-        <listitem>
-          <para>
-            converts the extensions for MyISAM (or ISAM ) table files to
+          <indexterm zone="mariadb mariadb-find-rows-mariadb">
+            <primary sortas="b-mariadb-find-rows-mariadb">mariadb-find-rows</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadb-fix-extensions-mariadb">
+        <term><command>mariadb-fix-extensions</command></term>
+        <listitem>
+          <para>
+            converts the extensions for MyISAM (or ISAM) table files to
             their canonical forms.
           </para>
-          <indexterm zone="mariadb mysql_fix_extensions-mariadb">
-            <primary sortas="b-mysql_fix_extensions-mariadb">mysql_fix_extensions</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysql_install_db-mariadb">
-        <term><command>mysql_install_db</command></term>
+          <indexterm zone="mariadb mariadb-fix-extensions-mariadb">
+            <primary sortas="b-mariadb-fix-extensions-mariadb">mariadb-fix-extensions</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadb-hotcopy-mariadb">
+        <term><command>mariadb-hotcopy</command></term>
+        <listitem>
+          <para>
+            locks the table, flush the table and then performs a copy of
+            the database.
+          </para>
+          <indexterm zone="mariadb mariadb-hotcopy-mariadb">
+            <primary sortas="b-mariadb-hotcopy-mariadb">mariadb-hotcopy</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadb-import-mariadb">
+        <term><command>mariadb-import</command></term>
+        <listitem>
+          <para>
+            reads a range of data formats, and inserts the data into a
+            database.
+          </para>
+          <indexterm zone="mariadb mariadb-import-mariadb">
+            <primary sortas="b-mariadb-import-mariadb">mariadb-import</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadb-install-db-mariadb">
+        <term><command>mariadb-install-db</command></term>
         <listitem>
           <para>
@@ -768,73 +838,124 @@
             tables that it contains, if they do not exist.
           </para>
-          <indexterm zone="mariadb mysql_install_db-mariadb">
-            <primary sortas="b-mysql_install_db-mariadb">mysql_install_db</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysql_ldb-mariadb">
-        <term><command>mysql_ldb</command></term>
+          <indexterm zone="mariadb mariadb-install-db-mariadb">
+            <primary sortas="b-mariadb-install-db-mariadb">mariadb-install-db</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadb-ldb-mariadb">
+        <term><command>mariadb-ldb</command></term>
         <listitem>
           <para>
             is the RocksDB tool.
           </para>
-          <indexterm zone="mariadb mysql_ldb-mariadb">
-            <primary sortas="b-mysql_ldb-mariadb">mysql_ldb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysql_plugin-mariadb">
-        <term><command>mysql_plugin</command></term>
-        <listitem>
-          <para>
-            is a utility that enable MySQL administrators to manage which
+          <indexterm zone="mariadb mariadb-ldb-mariadb">
+            <primary sortas="b-mariadb-ldb-mariadb">mariadb-ldb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadb-plugin-mariadb">
+        <term><command>mariadb-plugin</command></term>
+        <listitem>
+          <para>
+            is a utility that enables MySQL administrators to manage which
             plugins a MySQL server loads.
           </para>
-          <indexterm zone="mariadb mysql_plugin-mariadb">
-            <primary sortas="b-mysql_plugin-mariadb">mysql_plugin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysql_secure_installation-mariadb">
-        <term><command>mysql_secure_installation</command></term>
+          <indexterm zone="mariadb mariadb-plugin-mariadb">
+            <primary sortas="b-mariadb-plugin-mariadb">mariadb-plugin</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadb-secure-installation-mariadb">
+        <term><command>mariadb-secure-installation</command></term>
         <listitem>
           <para>
             is a tool to improve MySQL installation security.
           </para>
-          <indexterm zone="mariadb mysql_secure_installation-mariadb">
-            <primary sortas="b-mysql_secure_installation-mariadb">mysql_secure_installation</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysql_setpermission-mariadb">
-        <term><command>mysql_setpermission</command></term>
+          <indexterm zone="mariadb mariadb-secure-installation-mariadb">
+            <primary sortas="b-mariadb-secure-installation-mariadb">mariadb-secure-installation</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadb-setpermission-mariadb">
+        <term><command>mariadb-setpermission</command></term>
         <listitem>
           <para>
             sets permissions in the MySQL grant tables.
           </para>
-          <indexterm zone="mariadb mysql_setpermission-mariadb">
-            <primary sortas="b-mysql_setpermission-mariadb">mysql_setpermission</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysql_tzinfo_to_sql-mariadb">
-        <term><command>mysql_tzinfo_to_sql</command></term>
+          <indexterm zone="mariadb mariadb-setpermission-mariadb">
+            <primary sortas="b-mariadb-setpermission-mariadb">mariadb-setpermission</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadb-show-mariadb">
+        <term><command>mariadb-show</command></term>
+        <listitem>
+          <para>
+            shows the structure of a MariaDB database.
+          </para>
+          <indexterm zone="mariadb mariadb-show-mariadb">
+            <primary sortas="b-mariadb-show-mariadb">mariadb-show</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadb-slap-mariadb">
+        <term><command>mariadb-slap</command></term>
+        <listitem>
+          <para>
+            is a diagnostic program designed to emulate client load for a
+            MySQL server and to report the timing of each stage.
+          </para>
+          <indexterm zone="mariadb mariadb-slap-mariadb">
+            <primary sortas="b-mariadb-slap-mariadb">mariadb-slap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadb-test-mariadb">
+        <term><command>mariadb-test</command></term>
+        <listitem>
+          <para>
+            runs a test case against a MySQL server and optionally compares
+            the output with a result file.
+          </para>
+          <indexterm zone="mariadb mariadb-test-mariadb">
+            <primary sortas="b-mariadb-test-mariadb">mariadb-test</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadb-test-embedded-mariadb">
+        <term><command>mariadb-test-embedded</command></term>
+        <listitem>
+          <para>
+            is similar to the <command>mysqltest</command> command but is built
+            with support for the libmysqld embedded server.
+          </para>
+          <indexterm zone="mariadb mariadb-test-embedded-mariadb">
+            <primary sortas="b-mariadb-test-embedded-mariadb">mariadb-test-embedded</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadb-tzinfo-to-sql-mariadb">
+        <term><command>mariadb-tzinfo-to-sql</command></term>
         <listitem>
           <para>
             loads the time zone tables in the mysql database.
           </para>
-          <indexterm zone="mariadb mysql_tzinfo_to_sql-mariadb">
-            <primary sortas="b-mysql_tzinfo_to_sql-mariadb">mysql_tzinfo_to_sql</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysql_upgrade-mariadb">
-        <term><command>mysql_upgrade</command></term>
+          <indexterm zone="mariadb mariadb-tzinfo-to-sql-mariadb">
+            <primary sortas="b-mariadb-tzinfo-to-sql-mariadb">mariadb-tzinfo-to-sql</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadb-upgrade-mariadb">
+        <term><command>mariadb-upgrade</command></term>
         <listitem>
           <para>
@@ -842,232 +963,128 @@
             the current version of MySQL Server.
           </para>
-          <indexterm zone="mariadb mysql_upgrade-mariadb">
-            <primary sortas="b-mysql_upgrade-mariadb">mysql_upgrade</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysql_waitpid-mariadb">
-        <term><command>mysql_waitpid</command></term>
+          <indexterm zone="mariadb mariadb-upgrade-mariadb">
+            <primary sortas="b-mariadb-upgrade-mariadb">mariadb-upgrade</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadb-waitpid-mariadb">
+        <term><command>mariadb-waitpid</command></term>
         <listitem>
           <para>
             signals a process to terminate and waits for the process to exit.
           </para>
-          <indexterm zone="mariadb mysql_waitpid-mariadb">
-            <primary sortas="b-mysql_waitpid-mariadb">mysql_waitpid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-<!--
-      <varlistentry id="mysql_zap-mariadb">
-        <term><command>mysql_zap</command></term>
-        <listitem>
-          <para>
-            is a tool to kill processes that match a pattern.
-          </para>
-          <indexterm zone="mariadb mysql_zap-mariadb">
-            <primary sortas="b-mysql_zap-mariadb">mysql_zap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-      <varlistentry id="mysqlaccess-mariadb">
-        <term><command>mysqlaccess</command></term>
-        <listitem>
-          <para>
-            checks the access privileges for a host name, user name, and
-            database combination.
-          </para>
-          <indexterm zone="mariadb mysqlaccess-mariadb">
-            <primary sortas="b-mysqlaccess-mariadb">mysqlaccess</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysqladmin-mariadb">
-        <term><command>mysqladmin</command></term>
-        <listitem>
-          <para>
-            is a client for performing administrative operations.
-          </para>
-          <indexterm zone="mariadb mysqladmin-mariadb">
-            <primary sortas="b-mysqladmin-mariadb">mysqladmin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysqlbinlog-mariadb">
-        <term><command>mysqlbinlog</command></term>
-        <listitem>
-          <para>
-            read binary log files.
-          </para>
-          <indexterm zone="mariadb mysqlbinlog-mariadb">
-            <primary sortas="b-mysqlbinlog-mariadb">mysqlbinlog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-<!--
-      <varlistentry id="mysqlbug-mariadb">
-        <term><command>mysqlbug</command></term>
-        <listitem>
-          <para>
-            is a tool to generate bug report.
-          </para>
-          <indexterm zone="mariadb mysqlbug-mariadb">
-            <primary sortas="b-mysqlbug-mariadb">mysqlbug</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-      <varlistentry id="mysqlcheck-mariadb">
-        <term><command>mysqlcheck</command></term>
-        <listitem>
-          <para>
-            performs table maintenance: It checks, repairs, optimizes,
-            or analyzes tables.
-          </para>
-          <indexterm zone="mariadb mysqlcheck-mariadb">
-            <primary sortas="b-mysqlcheck-mariadb">mysqlcheck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysqld-mariadb">
-        <term><command>mysqld</command></term>
-        <listitem>
-          <para>
-            is the MySQL server daemon.
-          </para>
-          <indexterm zone="mariadb mysqld-mariadb">
-            <primary sortas="b-mysqld-mariadb">mysqld</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysqld_multi-mariadb">
-        <term><command>mysqld_multi</command></term>
-        <listitem>
-          <para>
-            is designed to manage several mysqld processes that listen for
-            connections on different Unix socket files and TCP/IP ports.
-          </para>
-          <indexterm zone="mariadb mysqld_multi-mariadb">
-            <primary sortas="b-mysqld_multi-mariadb">mysqld_multi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysqld_safe-mariadb">
-        <term><command>mysqld_safe</command></term>
-        <listitem>
-          <para>
-             is the recommended way to start a mysqld server on Unix
-             and NetWare.
-          </para>
-          <indexterm zone="mariadb mysqld_safe-mariadb">
-            <primary sortas="b-mysqld_safe-mariadb">mysqld_safe</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysqldump-mariadb">
-        <term><command>mysqldump</command></term>
-        <listitem>
-          <para>
-            is a backup program.
-          </para>
-          <indexterm zone="mariadb mysqldump-mariadb">
-            <primary sortas="b-mysqldump-mariadb">mysqldump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysqldumpslow-mariadb">
-        <term><command>mysqldumpslow</command></term>
-        <listitem>
-          <para>
-            parses MySQL slow query log files and prints a summary of their
-            contents.
-          </para>
-          <indexterm zone="mariadb mysqldumpslow-mariadb">
-            <primary sortas="b-mysqldumpslow-mariadb">mysqldumpslow</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysqlhotcopy-mariadb">
-        <term><command>mysqlhotcopy</command></term>
-        <listitem>
-          <para>
-            locks the table, flush the table and then performs a copy of
-            the database.
-          </para>
-          <indexterm zone="mariadb mysqlhotcopy-mariadb">
-            <primary sortas="b-mysqlhotcopy-mariadb">mysqlhotcopy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysqlimport-mariadb">
-        <term><command>mysqlimport</command></term>
-        <listitem>
-          <para>
-            reads a range of data formats, and inserts the data into a
-            database.
-          </para>
-          <indexterm zone="mariadb mysqlimport-mariadb">
-            <primary sortas="b-mysqlimport-mariadb">mysqlimport</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysqlshow-mariadb">
-        <term><command>mysqlshow</command></term>
-        <listitem>
-          <para>
-            shows the structure of a MariaDB database.
-          </para>
-          <indexterm zone="mariadb mysqlshow-mariadb">
-            <primary sortas="b-mysqlshow-mariadb">mysqlshow</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysqlslap-mariadb">
-        <term><command>mysqlslap</command></term>
-        <listitem>
-          <para>
-            is a diagnostic program designed to emulate client load for a
-            MySQL server and to report the timing of each stage.
-          </para>
-          <indexterm zone="mariadb mysqlslap-mariadb">
-            <primary sortas="b-mysqlslap-mariadb">mysqlslap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysqltest-mariadb">
-        <term><command>mysqltest</command></term>
-        <listitem>
-          <para>
-            runs a test case against a MySQL server and optionally compares
-            the output with a result file.
-          </para>
-          <indexterm zone="mariadb mysqltest-mariadb">
-            <primary sortas="b-mysqltest-mariadb">mysqltest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysqltest_embedded-mariadb">
-        <term><command>mysqltest_embedded</command></term>
-        <listitem>
-          <para>
-            is similar to the <command>mysqltest</command> command but is built
-            with support for the libmysqld embedded server.
-          </para>
-          <indexterm zone="mariadb mysqltest_embedded-mariadb">
-            <primary sortas="b-mysqltest_embedded-mariadb">mysqltest_embedded</primary>
+          <indexterm zone="mariadb mariadb-waitpid-mariadb">
+            <primary sortas="b-mariadb-waitpid-mariadb">mariadb-waitpid</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mariadb_config-mariadb">
+        <term><command>mariadb_config</command></term>
+        <listitem>
+          <para>
+            gets compiler flags for using the MariaDB Connector/C.
+          </para>
+          <indexterm zone="mariadb mariadb_config-mariadb">
+            <primary sortas="b-mariadb_config-mariadb">mariadb_config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mbstream-mariadb">
+        <term><command>mbstream</command></term>
+        <listitem>
+          <para>
+            is an utility for sending InnoDB and XTraDB backups over a stream
+          </para>
+          <indexterm zone="mariadb mbstream-mariadb">
+            <primary sortas="b-mbstream-mariadb">mbstream</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="msql2mysql-mariadb">
+        <term><command>msql2mysql</command></term>
+        <listitem>
+          <para>
+            is a tool to convert mSQL programs for use with MySQL.
+          </para>
+          <indexterm zone="mariadb msql2mysql-mariadb">
+            <primary sortas="b-msql2mysql-mariadb">msql2mysql</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="my_print_defaults-mariadb">
+        <term><command>my_print_defaults</command></term>
+        <listitem>
+          <para>
+            displays the options from option groups of option files.
+          </para>
+          <indexterm zone="mariadb my_print_defaults-mariadb">
+            <primary sortas="b-my_print_defaults-mariadb">my_print_defaults</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="myisam_ftdump-mariadb">
+        <term><command>myisam_ftdump</command></term>
+        <listitem>
+          <para>
+            displays information about FULLTEXT indexes in MyISAM tables.
+          </para>
+          <indexterm zone="mariadb myisam_ftdump-mariadb">
+            <primary sortas="b-myisam_ftdump-mariadb">myisam_ftdump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="myisamchk-mariadb">
+        <term><command>myisamchk</command></term>
+        <listitem>
+          <para>
+            gets information about your database tables or checks, repairs,
+            or optimizes them.
+          </para>
+          <indexterm zone="mariadb myisamchk-mariadb">
+            <primary sortas="b-myisamchk-mariadb">myisamchk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="myisamlog-mariadb">
+        <term><command>myisamlog</command></term>
+        <listitem>
+          <para>
+            displays MyISAM log file contents.
+          </para>
+          <indexterm zone="mariadb myisamlog-mariadb">
+            <primary sortas="b-myisamlog-mariadb">myisamlog</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="myisampack-mariadb">
+        <term><command>myisampack</command></term>
+        <listitem>
+          <para>
+            is a tool for compressing MyISAM tables.
+          </para>
+          <indexterm zone="mariadb myisampack-mariadb">
+            <primary sortas="b-myisampack-mariadb">myisampack</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mysql_config-mariadb">
+        <term><command>mysql_config</command></term>
+        <listitem>
+          <para>
+            provides you with useful information for compiling your MySQL
+            client and connecting it to MySQL.
+          </para>
+          <indexterm zone="mariadb mysql_config-mariadb">
+            <primary sortas="b-mysql_config-mariadb">mysql_config</primary>
           </indexterm>
         </listitem>
