diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-22 16:22:31 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-22 16:22:31 +0300 |
| commit | 0ceeeafe85316e594d8ba42a6d0c3c29201944bf (patch) | |
| tree | 1d77daf398f43cbe5998ff4f0676165e6808927c /sql/mysqld.cc | |
| parent | 7a9f2e57e3325a56434704e9ba9fc4f424678a0b (diff) | |
| parent | 4836199d701af05a9c89563b642c51ee5640e804 (diff) | |
| download | mariadb-git-0ceeeafe85316e594d8ba42a6d0c3c29201944bf.tar.gz | |
Manual merge from mysql-next-mr.
Conflicts:
- mysql-test/r/mysqld--help-notwin.result
- mysql-test/r/mysqld--help-win.result
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 3675ebbc973..6bd133660b3 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -181,6 +181,9 @@ typedef fp_except fp_except_t; /* for IRIX to use set_fpc_csr() */ #include <sys/fpu.h> #endif +#ifdef HAVE_FPU_CONTROL_H +#include <fpu_control.h> +#endif #if defined(__i386__) && !defined(HAVE_FPU_CONTROL_H) # define fpu_control_t unsigned int # define _FPU_EXTENDED 0x300 @@ -4467,7 +4470,7 @@ static void test_lc_time_sz() #ifdef __WIN__ int win_main(int argc, char **argv) #else -int main(int argc, char **argv) +int mysqld_main(int argc, char **argv) #endif { /* @@ -5013,7 +5016,7 @@ default_service_handling(char **argv, } -int main(int argc, char **argv) +int mysqld_main(int argc, char **argv) { /* When several instances are running on the same machine, we @@ -7666,7 +7669,7 @@ static char *get_relative_path(const char *path) strcmp(DEFAULT_MYSQL_HOME,FN_ROOTDIR)) { path+=(uint) strlen(DEFAULT_MYSQL_HOME); - while (*path == FN_LIBCHAR) + while (*path == FN_LIBCHAR || *path == FN_LIBCHAR2) path++; } return (char*) path; |