[debian-mysql] Bug#906305: Bug#906305: galera-3: FTBFS on hurd-i386

[Samuel Thibault]

Hello,

I have posted the attached fixes as

https://github.com/codership/galera/pull/525
https://github.com/codership/galera/pull/526

Concerning galera_tests_saved_state_check.cpp.diff, I believe it's
actually a gnumach scheduling issues that we ought to fix in gnumach
itself because it's hurting some other use cases.

Samuel
-------------- next part --------------
commit 14be958837ce6cae9eb39b9c35d3e0a55a13e1b8
Author: Samuel Thibault <samuel.thibault at ens-lyon.org>
Date:   Sat Nov 3 13:29:38 2018 +0100

    Fix Hurd build

diff --git a/galerautils/src/gu_resolver.cpp b/galerautils/src/gu_resolver.cpp
index 9dbc2a13..39f558ab 100644
--- a/galerautils/src/gu_resolver.cpp
+++ b/galerautils/src/gu_resolver.cpp
@@ -258,7 +258,7 @@ out:
                 {
                     err = errno;
                 }
-#if defined(__linux__)
+#if defined(__linux__) || defined(__GNU__)
                 idx = ifrp->ifr_ifindex;
 #elif defined(__sun__)
                 idx = ifrp->ifr_index;
-------------- next part --------------
commit 783cd805a7413a7d415ab97a2857b0d925d5cc08
Author: Samuel Thibault <samuel.thibault at ens-lyon.org>
Date:   Sun Nov 4 13:09:16 2018 +0100

    Do not assume timestamps are strictly monotonous
    
    Some OS do not provide sub-tick time granularity, and ticks can typically be
    10ms.

diff --git a/gcs/src/unit_tests/gcs_sm_test.cpp b/gcs/src/unit_tests/gcs_sm_test.cpp
index 839e21c4..14a3dbd2 100644
--- a/gcs/src/unit_tests/gcs_sm_test.cpp
+++ b/gcs/src/unit_tests/gcs_sm_test.cpp
@@ -280,7 +280,7 @@ START_TEST (gcs_sm_test_pause)
     long long tmp;
     gcs_sm_stats_get (sm, &q_len, &q_len_max, &q_len_min, &q_len_avg,
                       &tmp, &paused_avg);
-    fail_if (tmp <= paused_ns); paused_ns = tmp;
+    fail_if (tmp < paused_ns); paused_ns = tmp;
     fail_if (paused_avg <= 0.0);
     fail_if (fabs(q_len_avg) > EPS,
              "q_len_avg: expected <= %e, got %e", EPS, fabs(q_len_avg));