Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
7b36a617
Commit
7b36a617
authored
Jun 06, 2011
by
Georgi Kodinov
Browse files
Options
Browse Files
Download
Plain Diff
merge mysql-5.1->mysql-5.5
parents
09b2be34
36740fd4
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
13 deletions
+13
-13
configure.cmake
configure.cmake
+1
-0
mysql-test/collections/default.experimental
mysql-test/collections/default.experimental
+0
-6
sql/mysqld.cc
sql/mysqld.cc
+12
-7
No files found.
configure.cmake
View file @
7b36a617
...
...
@@ -345,6 +345,7 @@ CHECK_FUNCTION_EXISTS (fconvert HAVE_FCONVERT)
CHECK_FUNCTION_EXISTS
(
fdatasync HAVE_FDATASYNC
)
CHECK_SYMBOL_EXISTS
(
fdatasync
"unistd.h"
HAVE_DECL_FDATASYNC
)
CHECK_FUNCTION_EXISTS
(
fesetround HAVE_FESETROUND
)
CHECK_FUNCTION_EXISTS
(
fedisableexcept HAVE_FEDISABLEEXCEPT
)
CHECK_FUNCTION_EXISTS
(
fpsetmask HAVE_FPSETMASK
)
CHECK_FUNCTION_EXISTS
(
fseeko HAVE_FSEEKO
)
CHECK_FUNCTION_EXISTS
(
fsync HAVE_FSYNC
)
...
...
mysql-test/collections/default.experimental
View file @
7b36a617
...
...
@@ -6,12 +6,10 @@ binlog.binlog_multi_engine # joro : NDB tests marked as experiment
funcs_1.charset_collation_1 # depends on compile-time decisions
main.func_math @freebsd # Bug#11751977 2010-05-04 alik main.func_math fails on FreeBSD in PB2
main.gis-rtree @freebsd # Bug#11749418 2010-05-04 alik test cases gis-rtree, type_float, type_newdecimal fail in embedded server
main.lock_multi_bug38499 # Bug#11755645 2009-09-19 alik main.lock_multi_bug38499 times out sporadically
main.outfile_loaddata @solaris # Bug#11755168 2010-01-20 alik Test "outfile_loaddata" fails (reproducible)
main.signal_demo3 @solaris # Bug#11755949 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
main.sp @solaris # Bug#11755949 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
main.type_float @freebsd # Bug#11749418 2010-05-04 alik test cases gis-rtree, type_float, type_newdecimal fail in embedded server
main.wait_timeout @solaris # Bug#11758972 2010-04-26 alik wait_timeout fails on OpenSolaris
rpl.rpl_innodb_bug28430 # Bug#11754425
...
...
@@ -28,7 +26,3 @@ sys_vars.ndb_log_update_as_write_basic
sys_vars.have_ndbcluster_basic
sys_vars.ndb_log_updated_only_basic
sys_vars.rpl_init_slave_func # Bug#12535301 2011-05-09 andrei sys_vars.rpl_init_slave_func mismatches in daily-5.5
main.gis-rtree # svoj: due to BUG#11749418
main.type_float # svoj: due to BUG#11749418
main.type_newdecimal # svoj: due to BUG#11749418
sql/mysqld.cc
View file @
7b36a617
...
...
@@ -163,12 +163,12 @@ extern int memcntl(caddr_t, size_t, int, caddr_t, int, int);
int
initgroups
(
const
char
*
,
unsigned
int
);
#endif
#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H)
#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H)
&& !defined(HAVE_FEDISABLEEXCEPT)
#include <ieeefp.h>
#ifdef HAVE_FP_EXCEPT // Fix type conflict
typedef
fp_except
fp_except_t
;
#endif
#endif
/* __FreeBSD__ && HAVE_IEEEFP_H */
#endif
/* __FreeBSD__ && HAVE_IEEEFP_H
&& !HAVE_FEDISABLEEXCEPT
*/
#ifdef HAVE_SYS_FPU_H
/* for IRIX to use set_fpc_csr() */
#include <sys/fpu.h>
...
...
@@ -194,19 +194,24 @@ extern "C" my_bool reopen_fstreams(const char *filename,
inline
void
setup_fpu
()
{
#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H)
#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H)
&& !defined(HAVE_FEDISABLEEXCEPT)
/* 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
Don't fall for overflow, underflow,divide-by-zero or loss of precision.
fpsetmask() is deprecated in favor of fedisableexcept() in C99.
*/
#if defined(
__i386__
)
#if defined(
FP_X_DNML
)
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
|
FP_X_DZ
|
FP_X_IMP
));
#endif
/* __i386__ */
#endif
/* __FreeBSD__ && HAVE_IEEEFP_H */
#endif
/* FP_X_DNML */
#endif
/* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT */
#ifdef HAVE_FEDISABLEEXCEPT
fedisableexcept
(
FE_ALL_EXCEPT
);
#endif
#ifdef HAVE_FESETROUND
/* Set FPU rounding mode to "round-to-nearest" */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment