Commit 46b51b91 authored by lenz@mysql.com's avatar lenz@mysql.com
Browse files

Merge lgrimmer@work.mysql.com:/home/bk/mysql 

into mysql.com:/space/my/mysql-3.23
parents b9d8e521 ad20c29c

BUILD/compile-solaris-sparc

+1 −1
Original line number Diff line number Diff line
@@ -11,6 +11,6 @@ then 
   (cd gemini && aclocal && autoheader && aclocal && automake && autoconf)

fi

 

CFLAGS="-g -Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused  -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa" CXX=gcc CXXFLAGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti  -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa -g" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client

CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused  -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa" CXX=gcc CXXFLAGS="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti  -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa -g" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client



gmake -j 4

BUILD/compile-solaris-sparc-purify

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ aclocal && autoheader && aclocal && automake && autoconf 
(cd bdb/dist && sh s_all)

(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)



CFLAGS="-g -Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused  -DHAVE_purify -DEXTRA_DEBUG -O2" CXX=gcc CXXLD=g++ CXXFLAGS="-g -Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti  -DHAVE_purify -DEXTRA_DEBUG -O2" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-berkeley-db --with-innodb

CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused  -DHAVE_purify -DEXTRA_DEBUG -O2" CXX=gcc CXXLD=g++ CXXFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti  -DHAVE_purify -DEXTRA_DEBUG -O2" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-berkeley-db --with-innodb



gmake -j 4

acinclude.m4

+33 −2
Original line number Diff line number Diff line
@@ -520,7 +520,8 @@ fi 


AC_DEFUN(MYSQL_STACK_DIRECTION,

 [AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,

 [AC_TRY_RUN([find_stack_direction ()

 [AC_TRY_RUN([#include <stdlib.h>

 int find_stack_direction ()

 {

   static char *addr = 0;

   auto char dummy;
@@ -532,7 +533,7 @@ AC_DEFUN(MYSQL_STACK_DIRECTION, 
   else

     return (&dummy > addr) ? 1 : -1;

 }

 main ()

 int main ()

 {

   exit (find_stack_direction() < 0);

 }], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1,
@@ -1152,3 +1153,33 @@ AC_DEFUN(MYSQL_SYS_LARGEFILE, 
	esac])

   fi

  ])



# Local version of _AC_PROG_CXX_EXIT_DECLARATION that does not

# include #stdlib.h as this breaks things on Solaris

# (Conflicts with pthreads and big file handling)



m4_define([_AC_PROG_CXX_EXIT_DECLARATION],

[for ac_declaration in \

   ''\

   'extern "C" void std::exit (int) throw (); using std::exit;' \

   'extern "C" void std::exit (int); using std::exit;' \

   'extern "C" void exit (int) throw ();' \

   'extern "C" void exit (int);' \

   'void exit (int);'

do

  _AC_COMPILE_IFELSE([AC_LANG_PROGRAM([@%:@include <stdlib.h>

$ac_declaration],

                                      [exit (42);])],

                     [],

                     [continue])

  _AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$ac_declaration],

                                      [exit (42);])],

                     [break])

done

rm -f conftest*

if test -n "$ac_declaration"; then

  echo '#ifdef __cplusplus' >>confdefs.h

  echo $ac_declaration      >>confdefs.h

  echo '#endif'             >>confdefs.h

fi

])# _AC_PROG_CXX_EXIT_DECLARATION