diff options
Diffstat (limited to 'package/mysql/patches')
| -rw-r--r-- | package/mysql/patches/patch-configure | 19 | ||||
| -rw-r--r-- | package/mysql/patches/patch-include_my_global_h | 54 |
2 files changed, 64 insertions, 9 deletions
diff --git a/package/mysql/patches/patch-configure b/package/mysql/patches/patch-configure index cf3239b22..0ce1eac1e 100644 --- a/package/mysql/patches/patch-configure +++ b/package/mysql/patches/patch-configure @@ -1,6 +1,6 @@ ---- mysql-5.1.41.orig/configure 2009-11-04 19:37:28.000000000 +0100 -+++ mysql-5.1.41/configure 2009-12-25 12:18:01.000000000 +0100 -@@ -46976,197 +46976,14 @@ $as_echo "$as_me: error: unknown endiann +--- mysql-5.1.41.orig/configure Wed Nov 4 19:37:28 2009 ++++ mysql-5.1.41/configure Tue Dec 29 13:28:43 2009 +@@ -46976,198 +46976,15 @@ $as_echo "$as_me: error: unknown endianness esac @@ -177,7 +177,7 @@ - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -- + -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 @@ -195,13 +195,15 @@ -fi - - - +- { $as_echo "$as_me:$LINENO: checking whether Solaris libc atomic functions are available" >&5 $as_echo_n "checking whether Solaris libc atomic functions are available... " >&6; } -@@ -47284,101 +47101,6 @@ fi + # either define HAVE_IB_SOLARIS_ATOMICS or not +@@ -47283,101 +47100,6 @@ _ACEOF + fi done - +- - { $as_echo "$as_me:$LINENO: checking whether pthread_t can be used by Solaris libc atomic functions" >&5 -$as_echo_n "checking whether pthread_t can be used by Solaris libc atomic functions... " >&6; } - # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not @@ -296,7 +298,6 @@ -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -- - # this is needed to know which one of atomic_cas_32() or atomic_cas_64() + diff --git a/package/mysql/patches/patch-include_my_global_h b/package/mysql/patches/patch-include_my_global_h new file mode 100644 index 000000000..2b262bbb4 --- /dev/null +++ b/package/mysql/patches/patch-include_my_global_h @@ -0,0 +1,54 @@ +--- mysql-5.1.41.orig/include/my_global.h Wed Nov 4 19:28:15 2009 ++++ mysql-5.1.41/include/my_global.h Tue Dec 29 13:39:20 2009 +@@ -18,6 +18,8 @@ + #ifndef _global_h + #define _global_h + ++#include <sys/param.h> ++ + /* + InnoDB depends on some MySQL internals which other plugins should not + need. This is because of InnoDB's foreign key support, "safe" binlog +@@ -424,7 +426,7 @@ C_MODE_END + #ifdef HAVE_FLOAT_H + #include <float.h> + #endif +-#ifdef HAVE_FENV_H ++#if defined(HAVE_FENV_H) && !defined(BSD) + #include <fenv.h> /* For fesetround() */ + #endif + +@@ -454,15 +456,20 @@ C_MODE_END + #undef HAVE_ALLOCA + #undef HAVE_ALLOCA_H + #endif +-#ifdef HAVE_ALLOCA_H ++#if defined(HAVE_ALLOCA_H) && !defined(BSD) + #include <alloca.h> + #endif + + #include <errno.h> /* Recommended by debian */ + /* We need the following to go around a problem with openssl on solaris */ ++#ifdef BSD ++#include <pwd.h> ++#include <unistd.h> ++#else + #if defined(HAVE_CRYPT_H) + #include <crypt.h> + #endif ++#endif + + /* + A lot of our programs uses asserts, so better to always include it +@@ -879,9 +886,11 @@ typedef SOCKET_SIZE_TYPE size_socket; + #endif /* HAVE_FINITE */ + #endif /* isfinite */ + ++/* + #ifndef HAVE_ISNAN + #define isnan(x) ((x) != (x)) + #endif ++*/ + + #ifdef HAVE_ISINF + /* Check if C compiler is affected by GCC bug #39228 */ |