diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2021-06-30 16:48:56 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2021-06-30 16:48:56 +0000 |
| commit | 89b30bb9de066abf8e3710b8f5f37bbe0489b549 (patch) | |
| tree | e2431898ae329b9274b9b145c7e069ff18fad5a7 /databases/mariadb104-server/files/patch-sql_mysqld.cc | |
| parent | mail/alpine: update to 2.24.2 (diff) | |
databases/mariadb104-server: Update to 10.4.20
* Fix build on RISC-V and i386 [1]
* Fix plist issue with WSREP on i386 [1]
PR: 256618
Submitted by: Robert Clausecker <fuz fuz su>
Diffstat (limited to 'databases/mariadb104-server/files/patch-sql_mysqld.cc')
| -rw-r--r-- | databases/mariadb104-server/files/patch-sql_mysqld.cc | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/databases/mariadb104-server/files/patch-sql_mysqld.cc b/databases/mariadb104-server/files/patch-sql_mysqld.cc index ab4a1ed810a5..4109d800da4c 100644 --- a/databases/mariadb104-server/files/patch-sql_mysqld.cc +++ b/databases/mariadb104-server/files/patch-sql_mysqld.cc @@ -1,6 +1,24 @@ ---- sql/mysqld.cc.orig 2017-05-14 23:13:18 UTC +--- sql/mysqld.cc.orig 2021-05-05 15:26:23 UTC +++ sql/mysqld.cc -@@ -4838,8 +4840,9 @@ static void init_ssl() +@@ -206,7 +206,7 @@ typedef fp_except fp_except_t; + + inline void setup_fpu() + { +-#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) ++#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) && defined(FP_X_INV) + /* We can't handle floating point exceptions with threads, so disable + this on freebsd + Don't fall for overflow, underflow,divide-by-zero or loss of precision. +@@ -219,7 +219,7 @@ inline void setup_fpu() + fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | + FP_X_IMP)); + #endif /* FP_X_DNML */ +-#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT */ ++#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT && defined(FP_X_INV) */ + + #ifdef HAVE_FEDISABLEEXCEPT + fedisableexcept(FE_ALL_EXCEPT); +@@ -5033,8 +5033,9 @@ static void init_ssl() while ((err= ERR_get_error())) sql_print_warning("SSL error: %s", ERR_error_string(err, NULL)); } |