Commit a31406e3 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Fix for Intel compiler (ecc)

Minor cleanups to other patches.
Make --temp-pool default
parent 40f8e028
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -8168,6 +8168,9 @@ Renamed mysqld startup options @code{--skip-locking} to
@code{--skip-external-locking} and @code{--enable-locking} to
@code{--external-locking}.
@item
mysqld now has the option @code{--temp-pool} enabled by default as this
gives better performance with some OS.
@item
@code{DOUBLE} and @code{FLOAT} columns now honour the
@code{UNSIGNED} flag on storage (before, @code{UNSIGNED} was ignored for
these columns).
@@ -50132,6 +50135,10 @@ each individual 4.0.x release.
@itemize @bullet
@item
mysqld now has the option @code{--temp-pool} enabled by default as this
gives better performance with some OS.
@item
@item
Fixed bug in @code{REVOKE} that caused user resources to be randomly set.
@item
Fixed bug in @code{GRANT} for the new @code{CREATE TEMPORARY TABLE} privilege.
+13 −0
Original line number Diff line number Diff line
@@ -1554,6 +1554,17 @@ AC_SUBST(TERMCAP_LIB)
#########################################################################

dnl Checks for library functions.

#
# The following code disables intrinsic function support while we test for
# library functions.  This is to avoid configure problems with Intel ecc
# compiler

ORG_CFLAGS="$CFLAGS"
if test "$GCC" != "yes"; then
  AC_SYS_COMPILER_FLAG(-nolib_inline,nolib_inline,CFLAGS,[],[])
fi

AC_FUNC_MMAP
AC_TYPE_SIGNAL
MYSQL_TYPE_QSORT
@@ -1576,6 +1587,8 @@ AC_CHECK_FUNCS(alarm bmove \
 pthread_condattr_create rwlock_init pthread_rwlock_rdlock \
 fchmod getpass getpassphrase initgroups mlockall)

CFLAGS="$ORG_CFLAGS"

# Sanity check: We chould not have any fseeko symbol unless
# large_file_support=yes
AC_CHECK_FUNCS(fseeko,
+11 −13
Original line number Diff line number Diff line
@@ -121,14 +121,6 @@
/* #define _AIX32_CURSES */	/* XXX: this breaks AIX 4.3.3 (others?). */
#endif

#ifdef __QNXNTO__
#define HAVE_ERRNO_AS_DEFINE
#define HAVE_FCNTL_LOCK
#undef  HAVE_SYS_UN_H
#undef  HAVE_FINITE
#undef  HAVE_RINT
#endif

#ifdef HAVE_BROKEN_SNPRINTF	/* HPUX 10.20 don't have this defined */
#undef HAVE_SNPRINTF
#endif
@@ -253,6 +245,17 @@
#define setrlimit cma_setrlimit64
#endif

#ifdef __QNXNTO__
/* This has to be after include limits.h */
#define HAVE_ERRNO_AS_DEFINE
#define HAVE_FCNTL_LOCK
#undef  HAVE_SYS_UN_H
#undef  HAVE_FINITE
#undef  HAVE_RINT
#undef  LONGLONG_MIN            /* These get wrongly defined in QNX 6.2 */
#undef  LONGLONG_MAX            /* standard system library 'limits.h' */
#endif

/* We can not live without the following defines */

#define USE_MYFUNC 1		/* Must use syscall indirection */
@@ -548,11 +551,6 @@ extern double my_atof(const char*);
#define HAVE_LONG_LONG 1
#endif

#ifdef __QNXNTO__
#undef  LONGLONG_MIN            /* These get wrongly defined in QNX 6.2 */
#undef  LONGLONG_MAX            /* standard system library 'limits.h' */
#endif

#if defined(HAVE_LONG_LONG) && !defined(LONGLONG_MIN)
#define LONGLONG_MIN	((long long) 0x8000000000000000LL)
#define LONGLONG_MAX	((long long) 0x7FFFFFFFFFFFFFFFLL)
+2 −1
Original line number Diff line number Diff line
@@ -430,6 +430,7 @@ struct tm *localtime_r(const time_t *clock, struct tm *res);

#if defined(HPUX) && !defined(DONT_REMAP_PTHREAD_FUNCTIONS)
#undef pthread_cond_timedwait
#undef pthread_mutex_trylock
#define pthread_cond_timedwait(a,b,c) my_pthread_cond_timedwait((a),(b),(c))
#define pthread_mutex_trylock(a) my_pthread_mutex_trylock((a))
int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
+2 −4
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ C_MODE_START
#ifdef HAVE_SEMAPHORE_H
#include <semaphore.h>
#elif defined(__bsdi__)
#include <sys/errno.h>
#else
#ifdef __WIN__
typedef HANDLE sem_t;
#else
@@ -45,7 +43,7 @@ typedef struct {
  pthread_cond_t  cond;
  uint            count;
} sem_t;
#endif
#endif /* __WIN__ */

int sem_init(sem_t * sem, int pshared, unsigned int value);
int sem_destroy(sem_t * sem);
@@ -55,7 +53,7 @@ int sem_post(sem_t * sem);
int sem_post_multiple(sem_t * sem, unsigned int count);
int sem_getvalue(sem_t * sem, unsigned int * sval);

#endif
#endif /* !__bsdi__ */

C_MODE_END
#endif /* !_my_semaphore_h_ */
Loading