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 mysql.com:/home/hf/work/mrg/my41-mrg

Browse Source 
into  mysql.com:/home/hf/work/mrg/my50-mrg


include/mysql_com.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
This commit is contained in:
unknown
2007-11-30 22:29:34 +04:00
parent 11c1729421 d87a75c15d
commit 4100e3e4c2
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/mysql_com.h
View File

@@ -391,7 +391,7 @@ typedef struct st_udf_init
unsigned int decimals; /* for real functions */ unsigned int decimals; /* for real functions */
unsigned long max_length; /* For string functions */ unsigned long max_length; /* For string functions */
char *ptr; /* free pointer for function data */ char *ptr; /* free pointer for function data */
my_bool const_item; /* 0 if result is independent of arguments */ my_bool const_item; /* 1 if function always returns the same value */
} UDF_INIT; } UDF_INIT;
/* /*
TODO: add a notion for determinism of the UDF. TODO: add a notion for determinism of the UDF.

20
sql/mysqld.cc
View File

@@ -184,7 +184,7 @@ typedef fp_except fp_except_t;
this on freebsd this on freebsd
*/ */
inline void reset_floating_point_exceptions() inline void set_proper_floating_point_mode()
{ {
/* 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 */
#if defined(__i386__) #if defined(__i386__)
@@ -195,8 +195,22 @@ inline void reset_floating_point_exceptions()
FP_X_IMP)); FP_X_IMP));
#endif #endif
} }
#elif defined(__sgi)
/* for IRIX to use set_fpc_csr() */
#include <sys/fpu.h>
inline void set_proper_floating_point_mode()
{
/* Enable denormalized DOUBLE values support for IRIX */
{
union fpc_csr n;
n.fc_word = get_fpc_csr();
n.fc_struct.flush = 0;
set_fpc_csr(n.fc_word);
}
}
#else #else
#define reset_floating_point_exceptions() #define set_proper_floating_point_mode()
#endif /* __FreeBSD__ && HAVE_IEEEFP_H */ #endif /* __FreeBSD__ && HAVE_IEEEFP_H */
} /* cplusplus */ } /* cplusplus */
@@ -3125,7 +3139,7 @@ static int init_server_components()
query_cache_init(); query_cache_init();
query_cache_resize(query_cache_size); query_cache_resize(query_cache_size);
randominit(&sql_rand,(ulong) server_start_time,(ulong) server_start_time/2); randominit(&sql_rand,(ulong) server_start_time,(ulong) server_start_time/2);
reset_floating_point_exceptions(); set_proper_floating_point_mode();
init_thr_lock(); init_thr_lock();
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
init_slave_list(); init_slave_list();