janneke pushed a commit to branch core-packages-team
in repository guix.

commit 3a4f80de170cc2fd0cd2a4f2c7c526f6978fe8ab
Author: Janneke Nieuwenhuizen <jann...@gnu.org>
AuthorDate: Tue Dec 31 10:36:25 2024 +0100

    gnu: mariadb: Update to 10.11.10 and fix build.
    
    * gnu/packages/databases.scm (mariadb): Update to 10.11.10.
    [arguments]: In phase "ajdust-tests", disable failing 
"main.mysqldump-header"
    test, and unstable "main.log_low" and "main.mysqld--help-aria" tests.
    
    Change-Id: Ic44c76b34d278ffebeebb2ae65b9f2b40bf43dd3
---
 gnu/packages/databases.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 66bf04414c..056f1cf6d4 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -956,7 +956,7 @@ Language.")
 (define-public mariadb
   (package
     (name "mariadb")
-    (version "10.10.2")
+    (version "10.11.10")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://downloads.mariadb.com/MariaDB";
@@ -964,7 +964,7 @@ Language.")
                                   version ".tar.gz"))
               (sha256
                (base32
-                "1ciw7y08wms9g3hzhyria49r1b9n5wpbhkndazv95d925c8x1jsp"))
+                "08phlqcwcwl753zi2jv702q7b3h25d489289mflnm8c31djp8smh"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -1074,11 +1074,16 @@ Language.")
                       ;; <https://jira.mariadb.org/browse/MDEV-26320>.
                       "main.selectivity_no_engine"
 
-                      ;; FIXME: This test checks various table encodings and
+                      ;; FIXME: These tests check various table encodings and
                       ;; fails because Guix defaults to UTF8 instead of the
                       ;; upstream default latin1_swedish_ci.  It's not easily
                       ;; substitutable because several encodings are tested.
                       "main.system_mysql_db"
+                      "main.mysqldump-header"
+
+                      ;; These test sometimes fail.
+                      "main.log_slow"
+                      "main.mysqld--help-aria"
 
                       ;; XXX: This test occasionally fails on i686-linux:
                       ;; <https://jira.mariadb.org/browse/MDEV-24458>

Reply via email to