Commit 19f7665a authored by Magnus Svensson's avatar Magnus Svensson
Browse files

Merge

parents d2773d34 78a3abec

BUILD/SETUP.sh

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ path=`dirname $0` 
. "$path/check-cpu"



export AM_MAKEFLAGS

AM_MAKEFLAGS="-j 4"

AM_MAKEFLAGS="-j 6"



# SSL library to use.--with-ssl will select our bundled yaSSL

# implementation of SSL. To use openSSl you will nee too point out
@@ -105,7 +105,7 @@ if [ "x$warning_mode" != "xpedantic" ]; then 
  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"

  debug_extra_cflags="-O0 -g3 -gdwarf-2" #1 -Wuninitialized"

else

  warnings="-W -Wall -ansi -pedantic -Wno-long-long -Wno-unused -D_POSIX_SOURCE"

  c_warnings="$warnings"

BUILD/compile-dist

+25 −8
Original line number Diff line number Diff line
@@ -13,34 +13,51 @@ path=`dirname $0` 


# Default to gcc for CC and CXX

if test -z "$CXX" ; then

  export CXX=gcc

  CXX=gcc

  # Set some required compile options

  if test -z "$CXXFLAGS" ; then

    export CXXFLAGS="-felide-constructors -fno-exceptions -fno-rtti"

    CXXFLAGS="-felide-constructors -fno-exceptions -fno-rtti"

  fi

fi



if test -z "$CC" ; then

  export CC=gcc

  CC=gcc

fi





# Use ccache, if available

if ccache -V > /dev/null 2>&1

then

  if ! (echo "$CC" | grep "ccache" > /dev/null)

  if echo "$CC" | grep "ccache" > /dev/null

  then

    export CC="ccache $CC"

    :

  else

    CC="ccache $CC"

  fi

  if ! (echo "$CXX" | grep "ccache" > /dev/null)

  if echo "$CXX" | grep "ccache" > /dev/null

  then

    export CXX="ccache $CXX"

    :

  else

    CXX="ccache $CXX"

  fi

fi



if test -z "$MAKE"

then

  if gmake -v > /dev/null 2>&1

  then

    MAKE="gmake"

  else

    MAKE="make"

  fi

fi



export CC CXX MAKE



# Make sure to enable all features that affect "make dist"

# Remember that configure restricts the man pages to the configured features !

./configure \

  --with-embedded-server \

  --with-ndbcluster

make
 
$MAKE

configure.in

+39 −29
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM 
#

# When changing major version number please also check switch statement

# in mysqlbinlog::check_master_version().

AM_INIT_AUTOMAKE(mysql, 5.1.30)

AM_INIT_AUTOMAKE(mysql, 5.1.31)

AM_CONFIG_HEADER([include/config.h:config.h.in])



PROTOCOL_VERSION=10
@@ -405,12 +405,15 @@ dnl Find paths to some shell programs 
AC_PATH_PROG(LN, ln, ln)

# This must be able to take a -f flag like normal unix ln.

AC_PATH_PROG(LN_CP_F, ln, ln)

if ! ( expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null ); then

case $SYSTEM_TYPE in

  *netware*) ;;

  *)

    # If ln -f does not exists use -s (AFS systems)

    if test -n "$LN_CP_F"; then

      LN_CP_F="$LN_CP_F -s"

    fi

fi

    ;;

esac



AC_PATH_PROG(MV, mv, mv)

AC_PATH_PROG(RM, rm, rm)
@@ -1642,14 +1645,16 @@ else 
  OPTIMIZE_CXXFLAGS="-O"

fi



if expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null; then

case $SYSTEM_TYPE in

  *netware*)

    DEBUG_CFLAGS="-g -DDEBUG -sym internal,codeview4"

    DEBUG_CXXFLAGS="-g -DDEBUG -sym internal,codeview4"

    DEBUG_OPTIMIZE_CC="-DDEBUG"

    DEBUG_OPTIMIZE_CXX="-DDEBUG"

    OPTIMIZE_CFLAGS="-O3 -DNDEBUG"

    OPTIMIZE_CXXFLAGS="-O3 -DNDEBUG"

fi

    ;;

esac



# If the user specified CFLAGS, we won't add any optimizations

if test -n "$SAVE_CFLAGS"
@@ -1915,7 +1920,9 @@ MYSQL_TZNAME 
# Do the c++ compiler have a bool type

MYSQL_CXX_BOOL

# Check some common bugs with gcc 2.8.# on sparc

if ! ( expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null ); then

case $SYSTEM_TYPE in

  *netware*) ;;

  *)

    MYSQL_CHECK_LONGLONG_TO_FLOAT

    if test "$ac_cv_conv_longlong_to_float" != "yes"

    then
@@ -1923,7 +1930,8 @@ then 
 If you are using gcc 2.8.# you should upgrade to egcs 1.0.3 or newer and try

    again])

    fi

fi

    ;;

esac

AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include <sys/types.h>])

AC_CHECK_TYPES([size_t], [], [], [#include <stdio.h>])

AC_CHECK_TYPES([u_int32_t])
@@ -2040,7 +2048,7 @@ AC_CHECK_FUNCS(alarm bcmp bfill bmove bsearch bzero \ 
  mkstemp mlockall perror poll pread pthread_attr_create mmap mmap64 getpagesize \

  pthread_attr_getstacksize pthread_attr_setprio pthread_attr_setschedparam \

  pthread_attr_setstacksize pthread_condattr_create pthread_getsequence_np \

  pthread_key_delete pthread_rwlock_rdlock pthread_setprio \

  pthread_key_delete pthread_rwlock_rdlock pthread_setprio pthread_setschedprio \

  pthread_setprio_np pthread_setschedparam pthread_sigmask readlink \

  realpath rename rint rwlock_init setupterm \

  shmget shmat shmdt shmctl sigaction sigemptyset sigaddset \
@@ -2549,11 +2557,12 @@ readline_h_ln_cmd="" 
readline_link=""

want_to_use_readline="no"



if expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null

then

case $SYSTEM_TYPE in

  *netware*)

    # For NetWare, do not need readline

    echo "Skipping readline"

else

    ;;

  *)

    if [test "$with_libedit" = "yes"] || [test "$with_libedit" = "undefined"] && [test "$with_readline" = "undefined"]

    then

	readline_topdir="cmd-line-utils"
@@ -2606,7 +2615,8 @@ else 
	      be built with libreadline. Please use --with-libedit to use

	      the bundled version of libedit instead.])

    fi

fi

    ;;

esac



AC_SUBST(readline_dir)

AC_SUBST(readline_topdir)

include/Makefile.am

+8 −5
Original line number Diff line number Diff line
@@ -15,8 +15,9 @@ 
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,

# MA 02111-1307, USA



BUILT_SOURCES =		$(HEADERS_GEN) link_sources

HEADERS_GEN =		mysql_version.h my_config.h

BUILT_SOURCES =		$(HEADERS_GEN_MAKE) link_sources

HEADERS_GEN_CONFIGURE =		mysql_version.h

HEADERS_GEN_MAKE =		my_config.h

HEADERS_ABI =		mysql.h mysql_com.h mysql_time.h \

			my_list.h my_alloc.h typelib.h mysql/plugin.h

pkginclude_HEADERS =	$(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \
@@ -25,7 +26,9 @@ pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \ 
			decimal.h errmsg.h my_global.h my_net.h \

			my_getopt.h sslopt-longopts.h my_dir.h \

			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \

			m_ctype.h my_attribute.h $(HEADERS_GEN)

			m_ctype.h my_attribute.h $(HEADERS_GEN_CONFIGURE) \

			$(HEADERS_GEN_MAKE)



noinst_HEADERS =	config-win.h config-netware.h my_bit.h \

			heap.h my_bitmap.h my_uctype.h \

			myisam.h myisampack.h myisammrg.h ft_global.h\
@@ -33,7 +36,7 @@ noinst_HEADERS = config-win.h config-netware.h my_bit.h \ 
			my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \

			my_aes.h my_tree.h my_trie.h hash.h thr_alarm.h \

			thr_lock.h t_ctype.h violite.h my_md5.h base64.h \

			mysql_version.h.in my_handler.h my_time.h \

			my_handler.h my_time.h \

			my_vle.h my_user.h my_atomic.h atomic/nolock.h \

			atomic/rwlock.h atomic/x86-gcc.h atomic/x86-msvc.h \

			atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h
@@ -45,7 +48,7 @@ CLEANFILES = $(BUILT_SOURCES) readline openssl 




# Some include files that may be moved and patched by configure

DISTCLEANFILES =	sched.h $(CLEANFILES)

DISTCLEANFILES =	sched.h $(CLEANFILES) $(HEADERS_GEN_CONFIGURE)



link_sources:

	-$(RM) -f readline openssl

include/my_pthread.h

+3 −0
Original line number Diff line number Diff line
@@ -279,6 +279,8 @@ int sigwait(sigset_t *setp, int *sigp); /* Use our implemention */ 
#define my_pthread_setprio(A,B) pthread_setprio_np((A),(B))

#elif defined(HAVE_PTHREAD_SETPRIO)

#define my_pthread_setprio(A,B) pthread_setprio((A),(B))

#elif defined(HAVE_PTHREAD_SETSCHEDPRIO)

#define my_pthread_setprio(A,B) pthread_setschedprio((A),(B))

#else

extern void my_pthread_setprio(pthread_t thread_id,int prior);

#endif
@@ -519,6 +521,7 @@ typedef struct st_my_pthread_fastmutex_t 
{

  pthread_mutex_t mutex;

  uint spins;

  uint rng_state;

} my_pthread_fastmutex_t;

void fastmutex_global_init(void);