database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 11.6 into 11.7

Browse Source
This commit is contained in:
Marko Mäkelä
2024-10-03 18:15:13 +03:00
parent 8478a06cdb 43465352b9
commit f493e46494
770 changed files with 14153 additions and 10520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/mysqld.cc
View File

@@ -209,7 +209,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.
@@ -222,7 +222,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 && FP_X_INV */
#ifdef HAVE_FEDISABLEEXCEPT
fedisableexcept(FE_ALL_EXCEPT);
@@ -6505,7 +6505,9 @@ void handle_connections_sockets()
&length);
if (mysql_socket_getfd(new_sock) != INVALID_SOCKET)
handle_accepted_socket(new_sock, sock);
else if (socket_errno != SOCKET_EINTR && socket_errno != SOCKET_EAGAIN)
else if (socket_errno == SOCKET_EAGAIN || socket_errno == SOCKET_EWOULDBLOCK)
break;
else if (socket_errno != SOCKET_EINTR)
{
/*
accept(2) failed on the listening port.