#6 Rebase to 25.3.33
Merged 2 years ago by mschorm. Opened 2 years ago by ljavorsk.
rpms/ ljavorsk/galera mariadb-10.3  into  mariadb-10.3

file modified
+1
@@ -11,3 +11,4 @@ 

  /galera-25.3.30.tar.gz

  /galera-25.3.31.tar.gz

  /galera-25.3.32.tar.gz

+ /galera-25.3.33.tar.gz

file modified
+12 -1
@@ -1,5 +1,5 @@ 

  Name:           galera

- Version:        25.3.32

+ Version:        25.3.33

  Release:        1%{?dist}

  Summary:        Synchronous multi-master wsrep provider (replication engine)

  
@@ -37,6 +37,14 @@ 

  %setup -q

  %patch0 -p1

  

+ # Fix for BZ#1959484

+ # The script is checking the version without the wsrep API number (the first number separated by dot)

+ # This could be caused by wrongly providing the version from wsrep_load function

+ # Issue is already reported here: https://github.com/codership/galera/issues/596

+ # So we can temporary remove API version from the test to make it work, however, we will wait for the upstream's

+ # solution in the issue linked above

+ sed -i '/^GALERA_VER/s/API + //' wsrep/tests/SConscript

+ 

  %build

  %{set_build_flags}

  
@@ -109,6 +117,9 @@ 

  

  

  %changelog

+ * Tue Jun 08 2021 Lukas Javorsky <ljavorsk@redhat.com> - 25.3.33-1

+ - Rebase to 25.3.33

+ 

  * Tue Feb 23 2021 Michal Schorm <mschorm@redhat.com> - 25.3.32-1

  - Rebase to 25.3.32

  

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (galera-25.3.32.tar.gz) = 4c0822fb337358db0900522466260e82666ccbae7f3d0f15dd996f824bf90064984d2f95300530ac497f063ad18f6135c24177e20f558a5728c2b29b0b713874

+ SHA512 (galera-25.3.33.tar.gz) = 08efcd2c90a3bb0baf04dc0c347b1ffcab8ad02982d1885546c79d45c3cda44e909d2746957d8e7f0169695d49a314284d0a2ae79042ef48b6d13118347a5a07

no initial comment

rebased onto 2d06e3e

2 years ago

1 new commit added

  • Fix the failing wsrep test issued in the BZ#1959484
2 years ago

Pull-Request has been merged by mschorm

2 years ago