Commit 878a155e authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1


configure.in:
  Auto merged
parents 77a9eede ca2e6e81

acinclude.m4

+23 −0
Original line number Diff line number Diff line
@@ -1624,6 +1624,11 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [ 
  --with-ndb-port-base  Base port for NDB Cluster transporters],

              [ndb_port_base="$withval"],

              [ndb_port_base="default"])

  AC_ARG_WITH([ndb-debug],

              [

  --without-ndb-debug   Disable special ndb debug features],

              [ndb_debug="$withval"],

              [ndb_debug="default"])

                                                                                

  AC_MSG_CHECKING([for NDB Cluster options])

  AC_MSG_RESULT([])
@@ -1663,6 +1668,24 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [ 
      ;;

  esac



  case "$ndb_debug" in

    yes )

      AC_MSG_RESULT([-- including ndb extra debug options])

      have_ndb_debug="yes"

      ;;

    full )

      AC_MSG_RESULT([-- including ndb extra extra debug options])

      have_ndb_debug="full"

      ;;

    no )

      AC_MSG_RESULT([-- not including ndb extra debug options])

      have_ndb_debug="no"

      ;;

    * )

      have_ndb_debug="default"

      ;;

  esac



  AC_MSG_RESULT([done.])

])

configure.in

+14 −3
Original line number Diff line number Diff line
@@ -3039,16 +3039,27 @@ then 
  MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --with-ndbcluster"



  CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)"

  if test "$with_debug" = "yes"

  if test "$have_ndb_debug" = "default"

  then

    have_ndb_debug=$with_debug

  fi



  if test "$have_ndb_debug" = "yes"

  then

    # Medium debug.

    NDB_DEFS="-DNDB_DEBUG -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD"

  elif test "$with_debug" = "full"

  elif test "$have_ndb_debug" = "full"

  then

    NDB_DEFS="-DNDB_DEBUG_FULL -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD"

  else

    # no extra ndb debug but still do asserts if debug version

    if test "$with_debug" = "yes" -o "$with_debug" = "full"

    then

      NDB_DEFS=""

    else

      NDB_DEFS="-DNDEBUG"

    fi

  fi



AC_SUBST([NDB_DEFS])

AC_SUBST([ndb_cxxflags_fix])