Index: server/databases/mariadb.xml
===================================================================
--- server/databases/mariadb.xml	(revision 94e00352a3e7ca581bd11351151257f7445e1e43)
+++ server/databases/mariadb.xml	(revision 55781c20039873fc66cfbdb5255c3809b22c4de6)
@@ -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        "c59999bd182ddeb3db3d55250aecd8f8">
-  <!ENTITY mariadb-size          "67 MB">
-  <!ENTITY mariadb-buildsize     "1.3 GB">
-  <!ENTITY mariadb-time          "8.4 SBU (with parallelism=4, add 0.5 SBU for tests)">
+  <!ENTITY mariadb-md5sum        "4d14eba77e964737b13893b8beaafb1c">
+  <!ENTITY mariadb-size          "69 MB">
+  <!ENTITY mariadb-buildsize     "1.8 GB">
+  <!ENTITY mariadb-time          "8.3 SBU (with parallelism=4, add 0.5 SBU for tests)">
 ]>
 
@@ -422,21 +422,22 @@
         <seg>
           aria_chk, aria_dump_log, aria_ftdump, aria_pack, aria_read_log,
-          galara_new_cluster, galara_recovery,
-          innochecksum, maria_add_gis_sp.sql, msql2mysql, my_print_defaults,
+          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_plugin,
+          mysql_fix_extensions, mysql_install_db, mysql_ldb, mysql_plugin,
           mysql_secure_installation, mysql_setpermission, mysql_tzinfo_to_sql,
-          mysql_upgrade, mysql_waitpid, mysql_zap, mysqlaccess, mysqladmin,
-          mysqlbinlog, mysqlbug, mysqlcheck, mysqld, mysqld_multi, mysqld_safe,
+          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, wsrep_sst_common, wsrep_sst_mysqldump,
+          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
         </seg>
         <seg>
-          libmysqlclient.{so,a},
-          libmysqlclient_r.{so,a} (symbolic links to libmysqlclient.{so,a}),
+          libmariadbclient.a, libmariadb.so, libmysqlclient.a,
+          libmysqlclient_r.a (symbolic links to libmariadbclient.a),
           libmysqld.{so,a}, libmysqlservices.a,
           and several under /usr/lib/mysql/plugin/
@@ -544,4 +545,40 @@
       </varlistentry>
 
+      <varlistentry id="mariabackup-mariadb">
+        <term><command>mariabackup</command></term>
+        <listitem>
+          <para>
+            is an open source backup tool for InnoDB and XtraDB.
+          </para>
+          <indexterm zone="mariadb mariabackup-mariadb">
+            <primary sortas="b-mariabackup-mariadb">mariabackup</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="maria_add_gis_sp.sql-mariadb">
         <term><command>maria_add_gis_sp.sql</command></term>
@@ -549,5 +586,5 @@
           <para>
             this script creates stored procedures required by the OpenGIS
-            standards, and is prepared to be run with the --bootstrap server
+            standards, and is prepared to be run with the -\-bootstrap server
             option.
           </para>
@@ -557,5 +594,5 @@
         </listitem>
       </varlistentry>
-
+-->
       <varlistentry id="msql2mysql-mariadb">
         <term><command>msql2mysql</command></term>
@@ -747,4 +784,16 @@
       </varlistentry>
 
+      <varlistentry id="mysql_ldb-mariadb">
+        <term><command>mysql_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>
@@ -820,5 +869,5 @@
         </listitem>
       </varlistentry>
-
+<!--
       <varlistentry id="mysql_zap-mariadb">
         <term><command>mysql_zap</command></term>
@@ -832,5 +881,5 @@
         </listitem>
       </varlistentry>
-
+-->
       <varlistentry id="mysqlaccess-mariadb">
         <term><command>mysqlaccess</command></term>
@@ -869,5 +918,5 @@
         </listitem>
       </varlistentry>
-
+<!--
       <varlistentry id="mysqlbug-mariadb">
         <term><command>mysqlbug</command></term>
@@ -881,5 +930,5 @@
         </listitem>
       </varlistentry>
-
+-->
       <varlistentry id="mysqlcheck-mariadb">
         <term><command>mysqlcheck</command></term>
@@ -1098,4 +1147,16 @@
       </varlistentry>
 
+      <varlistentry id="sst_sump-mariadb">
+        <term><command>sst_sump</command></term>
+        <listitem>
+          <para>
+            dumps the content of sst files (the format used by RocksDB).
+          </para>
+          <indexterm zone="mariadb sst_sump-mariadb">
+            <primary sortas="b-sst_sump-mariadb">sst_sump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
