Commit 52d080f0 authored by unknown's avatar unknown
Browse files

Content merge. 


sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
innobase/trx/trx0roll.c:
  Auto merged.
parents 868266f1 272b380b

BUILD/SETUP.sh

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wcto 


alpha_cflags="-mcpu=ev6 -Wa,-mev6"	# Not used yet

pentium_cflags="-mcpu=pentiumpro"

pentium64_cflags="-mcpu=nocona -m64"

ppc_cflags="-mpowerpc -mcpu=powerpc"

sparc_cflags=""

BUILD/compile-pentium64-valgrind-max

0 → 100644
+29 −0
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$pentium64_cflags $debug_cflags -USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify -DMYSQL_SERVER_SUFFIX=-valgrind-max"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs"



# We want to test isam when building with valgrind

extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-isam --with-embedded-server --with-openssl --with-vio --with-raid --with-ndbcluster"



. "$path/FINISH.sh"



if test -z "$just_print"

then

  set +v +x

  echo "\

******************************************************************************

Note that by default BUILD/compile-pentium-valgrind-max calls 'configure' with

--enable-assembler. When Valgrind detects an error involving an assembly

function (for example an uninitialized value used as an argument of an

assembly function), Valgrind will not print the stacktrace and 'valgrind

--gdb-attach=yes' will not work either. If you need a stacktrace in those

cases, you have to run BUILD/compile-pentium-valgrind-max with the

--disable-assembler argument.

******************************************************************************"

fi

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ joerg@mysql.com 
joreland@mysql.com

jorge@linux.jorge.mysql.com

jplindst@t41.(none)

kaa@polly.local

kaj@work.mysql.com

kent@mysql.com

konstantin@mysql.com

config/ac-macros/ha_federated.m4

0 → 100644
+29 −0
Original line number Diff line number Diff line 
dnl ---------------------------------------------------------------------------

dnl Macro: MYSQL_CHECK_FEDERATED

dnl Sets HAVE_FEDERATED if --with-federated-storage-engine is used

dnl ---------------------------------------------------------------------------

AC_DEFUN([MYSQL_CHECK_FEDERATED], [

  AC_ARG_WITH([federated-storage-engine],

              [

  --with-federated-storage-engine

                        Enable the MySQL Storage Engine],

              [federateddb="$withval"],

              [federateddb=no])

  AC_MSG_CHECKING([for MySQL federated storage engine])



  case "$federateddb" in

    yes )

      AC_DEFINE([HAVE_FEDERATED_DB], [1], [Define to enable Federated Handler])

      AC_MSG_RESULT([yes])

      [federateddb=yes]

      ;;

    * )

      AC_MSG_RESULT([no])

      [federateddb=no]

      ;;

  esac



])

dnl ---------------------------------------------------------------------------

dnl END OF MYSQL_CHECK_FEDERATED SECTION

dnl ---------------------------------------------------------------------------

configure.in

+19 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ sinclude(config/ac-macros/compiler_flag.m4) 
sinclude(config/ac-macros/ha_archive.m4)

sinclude(config/ac-macros/ha_berkeley.m4)

sinclude(config/ac-macros/ha_example.m4)

sinclude(config/ac-macros/ha_federated.m4)

sinclude(config/ac-macros/ha_innodb.m4)

sinclude(config/ac-macros/ha_isam.m4)

sinclude(config/ac-macros/ha_ndbcluster.m4)
@@ -748,7 +749,7 @@ AC_CHECK_HEADERS(fcntl.h float.h floatingpoint.h ieeefp.h limits.h \ 
 strings.h string.h synch.h sys/mman.h sys/socket.h netinet/in.h arpa/inet.h \

 sys/timeb.h sys/types.h sys/un.h sys/vadvise.h sys/wait.h term.h \

 unistd.h utime.h sys/utime.h termio.h termios.h sched.h crypt.h alloca.h \

 sys/ioctl.h malloc.h sys/malloc.h linux/config.h)

 sys/ioctl.h malloc.h sys/malloc.h sys/ipc.h sys/shm.h linux/config.h)



#--------------------------------------------------------------------

# Check for system libraries. Adds the library to $LIBS
@@ -775,6 +776,22 @@ AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt])) 
AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init))

MYSQL_CHECK_ZLIB_WITH_COMPRESS



# For large pages support

if test "$IS_LINUX" = "true"

then

  # For SHM_HUGETLB on Linux

  AC_CHECK_DECLS(SHM_HUGETLB, 

      AC_DEFINE([HAVE_LARGE_PAGES], [1], 

                [Define if you have large pages support])

      AC_DEFINE([HUGETLB_USE_PROC_MEMINFO], [1],

                [Define if /proc/meminfo shows the huge page size (Linux only)])

      , ,

      [

#include <sys/shm.h>

      ]

  )

fi



#--------------------------------------------------------------------

# Check for TCP wrapper support

#--------------------------------------------------------------------
@@ -2420,6 +2437,7 @@ MYSQL_CHECK_EXAMPLEDB 
MYSQL_CHECK_ARCHIVEDB

MYSQL_CHECK_CSVDB

MYSQL_CHECK_NDBCLUSTER

MYSQL_CHECK_FEDERATED



# If we have threads generate some library functions and test programs

sql_server_dirs=