Changeset d6e4445 for server/databases

Timestamp:

02/01/2016 06:52:00 AM (9 years ago)

Author:

DJ Lucas <dj@…>

Branches:

systemd-13485

Children:

2f034e7

Parents:

12fbef3

Message:

Merge changes from trunk r16889, r16890, and r16892.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@16893 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

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

server/databases/mariadb.xml

@@ -7 +7 @@
   <!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        "9aa4d68b24c1ddd8cb56923a920684b3">
+  <!ENTITY mariadb-md5sum        "c199608ae4282f16007dc8c270ff2439">
   <!ENTITY mariadb-size          "53 MB">
   <!ENTITY mariadb-buildsize     "1.6 GB (with tests)">
-  <!ENTITY mariadb-time          "3.8 SBU, (with tests - all using parallelism=4)">
+  <!ENTITY mariadb-time          "4 SBU, (with tests - all using parallelism=4)">
 ]>
 
@@ -94 +94 @@
       <xref linkend="libxml2"/>,
       <xref linkend="linux-pam"/>,
+      <xref linkend="mitkrb"/>,
       <xref linkend="pcre"/>,
       <xref linkend="ruby"/>,
@@ -391 +392 @@
         <seg>
           aria_chk, aria_dump_log, aria_ftdump, aria_pack, aria_read_log,
-          innochecksum, msql2mysql, my_print_defaults, 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_secure_installation,
-          mysql_setpermission, mysql_tzinfo_to_sql, mysql_upgrade,
-          mysql_waitpid, mysql_zap, mysqlaccess, mysqladmin, mysqlbinlog,
-          mysqlbug, mysqlcheck, mysqld, mysqld_multi, mysqld_safe, mysqldump,
-          mysqldumpslow, mysqlhotcopy, mysqlimport, mysqlshow, mysqlslap,
-          mysqltest, mysqltest_embedded, mytop, perror, replace,
+          innochecksum, maria_add_gis_sp.sql, msql2mysql, my_print_defaults,
+          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_secure_installation, mysql_setpermission, mysql_tzinfo_to_sql,
+          mysql_upgrade, mysql_waitpid, mysql_zap, mysqlaccess, mysqladmin,
+          mysqlbinlog, mysqlbug, mysqlcheck, mysqld, mysqld_multi, mysqld_safe,
+          mysqldump, mysqldumpslow, mysqlhotcopy, mysqlimport, mysqlshow,
+          mysqlslap, mysqltest, mysqltest_embedded, mytop, perror, replace,
           resolve_stack_dump, resolveip, wsrep_sst_common, wsrep_sst_mysqldump,
           wsrep_sst_rsync, wsrep_sst_xtrabackup, and wsrep_sst_xtrabackup-v2
@@ -512 +513 @@
       </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 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>