Commit 74cbd71e authored by jani@a88-113-38-195.elisa-laajakaista.fi's avatar jani@a88-113-38-195.elisa-laajakaista.fi
Browse files

Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main 

into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
parents ab013df0 eac3a26e

BUILD/SETUP.sh

+4 −2
Original line number Diff line number Diff line
@@ -100,8 +100,10 @@ if [ "x$warning_mode" != "xpedantic" ]; then 
# C warnings

  c_warnings="$warnings -Wunused-parameter"

# C++ warnings

  cxx_warnings="$warnings -Woverloaded-virtual -Wsign-promo -Wreorder"

  cxx_warnings="$warnings -Wctor-dtor-privacy -Wnon-virtual-dtor"

  cxx_warnings="$warnings"

# cxx_warnings="$cxx_warnings -Woverloaded-virtual -Wsign-promo"

  cxx_warnings="$cxx_warnings -Wreorder"

  cxx_warnings="$cxx_warnings -Wctor-dtor-privacy -Wnon-virtual-dtor"

# Added unless --with-debug=full

  debug_extra_cflags="-O1 -Wuninitialized"

else

client/mysql.cc

+1 −0
Original line number Diff line number Diff line
@@ -1126,6 +1126,7 @@ int main(int argc,char *argv[]) 
  if (mysql_server_init(embedded_server_arg_count, embedded_server_args, 

                        (char**) embedded_server_groups))

  {

    put_error(NULL);

    free_defaults(defaults_argv);

    my_end(0);

    exit(1);

client/mysqldump.c

+1 −0
Original line number Diff line number Diff line
@@ -4306,6 +4306,7 @@ static int do_show_master_status(MYSQL *mysql_con) 
      my_printf_error(0, "Error: Binlogging on server not active",

                      MYF(0));

      mysql_free_result(master);

      maybe_exit(EX_MYSQLERR);

      return 1;

    }

    mysql_free_result(master);

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -1031,8 +1031,8 @@ case $SYSTEM_TYPE in 
    ;;

  *hpux11.*)

    AC_MSG_WARN([Enabling workarounds for hpux 11])

    CFLAGS="$CFLAGS -DHPUX11  -DSNPRINTF_RETURN_TRUNC -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -DHAVE_BROKEN_GETPASS -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT"

    CXXFLAGS="$CXXFLAGS -DHPUX11  -DSNPRINTF_RETURN_TRUNC -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -D_INCLUDE_LONGLONG -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT"

    CFLAGS="$CFLAGS -DHPUX11  -DSNPRINTF_RETURN_TRUNC -DHAVE_BROKEN_PREAD -DHAVE_BROKEN_GETPASS -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT"

    CXXFLAGS="$CXXFLAGS -DHPUX11  -DSNPRINTF_RETURN_TRUNC -DHAVE_BROKEN_PREAD -D_INCLUDE_LONGLONG -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT"

    if test "$with_named_thread" = "no"

    then 

      AC_MSG_WARN([Using --with-named-thread=-lpthread])

include/my_global.h

+7 −6
Original line number Diff line number Diff line
@@ -488,9 +488,6 @@ C_MODE_END 
#include <sys/stream.h>		/* HPUX 10.20 defines ulong here. UGLY !!! */

#define HAVE_ULONG

#endif

#ifdef DONT_USE_FINITE		/* HPUX 11.x has is_finite() */

#undef HAVE_FINITE

#endif

#if defined(HPUX10) && defined(_LARGEFILE64_SOURCE) && defined(THREAD)

/* Fix bug in setrlimit */

#undef setrlimit
@@ -860,9 +857,13 @@ typedef SOCKET_SIZE_TYPE size_socket; 
#define SIZE_T_MAX ~((size_t) 0)

#endif



#ifndef HAVE_FINITE

#ifndef isfinite

#ifdef HAVE_FINITE

#define isfinite(x) finite(x)

#else

#define finite(x) (1.0 / fabs(x) > 0.0)

#endif

#endif /* HAVE_FINITE */

#endif /* isfinite */



#ifndef HAVE_ISNAN

#define isnan(x) ((x) != (x))
@@ -872,7 +873,7 @@ typedef SOCKET_SIZE_TYPE size_socket; 
/* isinf() can be used in both C and C++ code */

#define my_isinf(X) isinf(X)

#else

#define my_isinf(X) (!finite(X) && !isnan(X))

#define my_isinf(X) (!isfinite(X) && !isnan(X))

#endif



/* Define missing math constants. */