From 56977a179237dc2a61d85c5ee7c01289f423f7f8 Mon Sep 17 00:00:00 2001 From: Dirk Froemberg Date: Mon, 21 Feb 2000 20:48:28 +0000 Subject: Fix build error! Submitted by: Dirk-Willem van Gulik --- databases/mysql322-server/files/patch-as | 14 ++++++++------ databases/mysql323-server/files/patch-as | 14 ++++++++------ databases/mysql40-server/files/patch-as | 14 ++++++++------ databases/mysql41-server/files/patch-as | 14 ++++++++------ databases/mysql50-server/files/patch-as | 14 ++++++++------ databases/mysql51-server/files/patch-as | 14 ++++++++------ databases/mysql54-server/files/patch-as | 14 ++++++++------ databases/mysql55-server/files/patch-as | 14 ++++++++------ databases/mysql60-server/files/patch-as | 14 ++++++++------ databases/percona55-server/files/patch-as | 14 ++++++++------ 10 files changed, 80 insertions(+), 60 deletions(-) diff --git a/databases/mysql322-server/files/patch-as b/databases/mysql322-server/files/patch-as index 4db26dbdd7c4..903bc9950a28 100644 --- a/databases/mysql322-server/files/patch-as +++ b/databases/mysql322-server/files/patch-as @@ -1,14 +1,16 @@ ---- sql/mysqld.cc.orig Fri Feb 18 23:06:34 2000 -+++ sql/mysqld.cc Fri Feb 18 23:07:46 2000 -@@ -63,7 +63,11 @@ +--- sql/mysqld.cc.orig Sun Feb 13 02:40:18 2000 ++++ sql/mysqld.cc Mon Feb 21 21:24:51 2000 +@@ -63,8 +63,11 @@ inline void reset_floating_point_exceptions() { /* Don't fall for overflow, underflow,divide-by-zero or loss of precision */ +- fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | +- FP_X_DZ | FP_X_IMP)); +#if defined(__i386__) - fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | ++ fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); +#else -+ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | ++ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); +#endif - FP_X_DZ | FP_X_IMP)); } #else + #define reset_floating_point_exceptions() diff --git a/databases/mysql323-server/files/patch-as b/databases/mysql323-server/files/patch-as index 4db26dbdd7c4..903bc9950a28 100644 --- a/databases/mysql323-server/files/patch-as +++ b/databases/mysql323-server/files/patch-as @@ -1,14 +1,16 @@ ---- sql/mysqld.cc.orig Fri Feb 18 23:06:34 2000 -+++ sql/mysqld.cc Fri Feb 18 23:07:46 2000 -@@ -63,7 +63,11 @@ +--- sql/mysqld.cc.orig Sun Feb 13 02:40:18 2000 ++++ sql/mysqld.cc Mon Feb 21 21:24:51 2000 +@@ -63,8 +63,11 @@ inline void reset_floating_point_exceptions() { /* Don't fall for overflow, underflow,divide-by-zero or loss of precision */ +- fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | +- FP_X_DZ | FP_X_IMP)); +#if defined(__i386__) - fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | ++ fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); +#else -+ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | ++ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); +#endif - FP_X_DZ | FP_X_IMP)); } #else + #define reset_floating_point_exceptions() diff --git a/databases/mysql40-server/files/patch-as b/databases/mysql40-server/files/patch-as index 4db26dbdd7c4..903bc9950a28 100644 --- a/databases/mysql40-server/files/patch-as +++ b/databases/mysql40-server/files/patch-as @@ -1,14 +1,16 @@ ---- sql/mysqld.cc.orig Fri Feb 18 23:06:34 2000 -+++ sql/mysqld.cc Fri Feb 18 23:07:46 2000 -@@ -63,7 +63,11 @@ +--- sql/mysqld.cc.orig Sun Feb 13 02:40:18 2000 ++++ sql/mysqld.cc Mon Feb 21 21:24:51 2000 +@@ -63,8 +63,11 @@ inline void reset_floating_point_exceptions() { /* Don't fall for overflow, underflow,divide-by-zero or loss of precision */ +- fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | +- FP_X_DZ | FP_X_IMP)); +#if defined(__i386__) - fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | ++ fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); +#else -+ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | ++ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); +#endif - FP_X_DZ | FP_X_IMP)); } #else + #define reset_floating_point_exceptions() diff --git a/databases/mysql41-server/files/patch-as b/databases/mysql41-server/files/patch-as index 4db26dbdd7c4..903bc9950a28 100644 --- a/databases/mysql41-server/files/patch-as +++ b/databases/mysql41-server/files/patch-as @@ -1,14 +1,16 @@ ---- sql/mysqld.cc.orig Fri Feb 18 23:06:34 2000 -+++ sql/mysqld.cc Fri Feb 18 23:07:46 2000 -@@ -63,7 +63,11 @@ +--- sql/mysqld.cc.orig Sun Feb 13 02:40:18 2000 ++++ sql/mysqld.cc Mon Feb 21 21:24:51 2000 +@@ -63,8 +63,11 @@ inline void reset_floating_point_exceptions() { /* Don't fall for overflow, underflow,divide-by-zero or loss of precision */ +- fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | +- FP_X_DZ | FP_X_IMP)); +#if defined(__i386__) - fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | ++ fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); +#else -+ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | ++ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); +#endif - FP_X_DZ | FP_X_IMP)); } #else + #define reset_floating_point_exceptions() diff --git a/databases/mysql50-server/files/patch-as b/databases/mysql50-server/files/patch-as index 4db26dbdd7c4..903bc9950a28 100644 --- a/databases/mysql50-server/files/patch-as +++ b/databases/mysql50-server/files/patch-as @@ -1,14 +1,16 @@ ---- sql/mysqld.cc.orig Fri Feb 18 23:06:34 2000 -+++ sql/mysqld.cc Fri Feb 18 23:07:46 2000 -@@ -63,7 +63,11 @@ +--- sql/mysqld.cc.orig Sun Feb 13 02:40:18 2000 ++++ sql/mysqld.cc Mon Feb 21 21:24:51 2000 +@@ -63,8 +63,11 @@ inline void reset_floating_point_exceptions() { /* Don't fall for overflow, underflow,divide-by-zero or loss of precision */ +- fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | +- FP_X_DZ | FP_X_IMP)); +#if defined(__i386__) - fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | ++ fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); +#else -+ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | ++ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); +#endif - FP_X_DZ | FP_X_IMP)); } #else + #define reset_floating_point_exceptions() diff --git a/databases/mysql51-server/files/patch-as b/databases/mysql51-server/files/patch-as index 4db26dbdd7c4..903bc9950a28 100644 --- a/databases/mysql51-server/files/patch-as +++ b/databases/mysql51-server/files/patch-as @@ -1,14 +1,16 @@ ---- sql/mysqld.cc.orig Fri Feb 18 23:06:34 2000 -+++ sql/mysqld.cc Fri Feb 18 23:07:46 2000 -@@ -63,7 +63,11 @@ +--- sql/mysqld.cc.orig Sun Feb 13 02:40:18 2000 ++++ sql/mysqld.cc Mon Feb 21 21:24:51 2000 +@@ -63,8 +63,11 @@ inline void reset_floating_point_exceptions() { /* Don't fall for overflow, underflow,divide-by-zero or loss of precision */ +- fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | +- FP_X_DZ | FP_X_IMP)); +#if defined(__i386__) - fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | ++ fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); +#else -+ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | ++ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); +#endif - FP_X_DZ | FP_X_IMP)); } #else + #define reset_floating_point_exceptions() diff --git a/databases/mysql54-server/files/patch-as b/databases/mysql54-server/files/patch-as index 4db26dbdd7c4..903bc9950a28 100644 --- a/databases/mysql54-server/files/patch-as +++ b/databases/mysql54-server/files/patch-as @@ -1,14 +1,16 @@ ---- sql/mysqld.cc.orig Fri Feb 18 23:06:34 2000 -+++ sql/mysqld.cc Fri Feb 18 23:07:46 2000 -@@ -63,7 +63,11 @@ +--- sql/mysqld.cc.orig Sun Feb 13 02:40:18 2000 ++++ sql/mysqld.cc Mon Feb 21 21:24:51 2000 +@@ -63,8 +63,11 @@ inline void reset_floating_point_exceptions() { /* Don't fall for overflow, underflow,divide-by-zero or loss of precision */ +- fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | +- FP_X_DZ | FP_X_IMP)); +#if defined(__i386__) - fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | ++ fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); +#else -+ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | ++ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); +#endif - FP_X_DZ | FP_X_IMP)); } #else + #define reset_floating_point_exceptions() diff --git a/databases/mysql55-server/files/patch-as b/databases/mysql55-server/files/patch-as index 4db26dbdd7c4..903bc9950a28 100644 --- a/databases/mysql55-server/files/patch-as +++ b/databases/mysql55-server/files/patch-as @@ -1,14 +1,16 @@ ---- sql/mysqld.cc.orig Fri Feb 18 23:06:34 2000 -+++ sql/mysqld.cc Fri Feb 18 23:07:46 2000 -@@ -63,7 +63,11 @@ +--- sql/mysqld.cc.orig Sun Feb 13 02:40:18 2000 ++++ sql/mysqld.cc Mon Feb 21 21:24:51 2000 +@@ -63,8 +63,11 @@ inline void reset_floating_point_exceptions() { /* Don't fall for overflow, underflow,divide-by-zero or loss of precision */ +- fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | +- FP_X_DZ | FP_X_IMP)); +#if defined(__i386__) - fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | ++ fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); +#else -+ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | ++ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); +#endif - FP_X_DZ | FP_X_IMP)); } #else + #define reset_floating_point_exceptions() diff --git a/databases/mysql60-server/files/patch-as b/databases/mysql60-server/files/patch-as index 4db26dbdd7c4..903bc9950a28 100644 --- a/databases/mysql60-server/files/patch-as +++ b/databases/mysql60-server/files/patch-as @@ -1,14 +1,16 @@ ---- sql/mysqld.cc.orig Fri Feb 18 23:06:34 2000 -+++ sql/mysqld.cc Fri Feb 18 23:07:46 2000 -@@ -63,7 +63,11 @@ +--- sql/mysqld.cc.orig Sun Feb 13 02:40:18 2000 ++++ sql/mysqld.cc Mon Feb 21 21:24:51 2000 +@@ -63,8 +63,11 @@ inline void reset_floating_point_exceptions() { /* Don't fall for overflow, underflow,divide-by-zero or loss of precision */ +- fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | +- FP_X_DZ | FP_X_IMP)); +#if defined(__i386__) - fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | ++ fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); +#else -+ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | ++ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); +#endif - FP_X_DZ | FP_X_IMP)); } #else + #define reset_floating_point_exceptions() diff --git a/databases/percona55-server/files/patch-as b/databases/percona55-server/files/patch-as index 4db26dbdd7c4..903bc9950a28 100644 --- a/databases/percona55-server/files/patch-as +++ b/databases/percona55-server/files/patch-as @@ -1,14 +1,16 @@ ---- sql/mysqld.cc.orig Fri Feb 18 23:06:34 2000 -+++ sql/mysqld.cc Fri Feb 18 23:07:46 2000 -@@ -63,7 +63,11 @@ +--- sql/mysqld.cc.orig Sun Feb 13 02:40:18 2000 ++++ sql/mysqld.cc Mon Feb 21 21:24:51 2000 +@@ -63,8 +63,11 @@ inline void reset_floating_point_exceptions() { /* Don't fall for overflow, underflow,divide-by-zero or loss of precision */ +- fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | +- FP_X_DZ | FP_X_IMP)); +#if defined(__i386__) - fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | ++ fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); +#else -+ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | ++ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP)); +#endif - FP_X_DZ | FP_X_IMP)); } #else + #define reset_floating_point_exceptions() -- cgit v1.2.3