Commit 5bb91691 authored by unknown's avatar unknown
Browse files

Manual merge 5.0->5.1 


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/innobase/include/lock0lock.h:
  Auto merged
storage/innobase/include/srv0srv.h:
  Auto merged
storage/innobase/lock/lock0lock.c:
  Auto merged
storage/innobase/srv/srv0srv.c:
  Auto merged
storage/ndb/test/src/NDBT_ResultRow.cpp:
  Auto merged
sql/slave.cc:
  Due to refactoring, this needs to be checked before the call.
sql/sql_acl.cc:
  Resolving conflicts due to bug fix and filter refactoring
parents 30322975 0baed276

BUILD/compile-darwin-mwcc

0 → 100755
+54 −0
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"



c_warnings=""

cxx_warnings=""

fast_cflags="-O3"

base_cxxflags="-fno-handle-exceptions"



# FIXME do we need to link static, not to depend on CodeWarrior libs?



if [ x$MODE = x ] ; then

  echo "You need to give an argument, 'standard', 'max', 'debug' or 'debug-max'"

  echo "Like: MODE=standard BUILD/compile-darwin-codewarrior"

  exit 1

else

  case $MODE in

    standard|pro-gpl)

      # FIXME pro/pro-gpl different libedit/readline

      extra_flags="$ppc_cflags $fast_cflags"

      ;;

    pro)

      # FIXME pro/pro-gpl different libedit/readline

      extra_flags="$ppc_cflags $fast_cflags"

      extra_configs="--with-libedit"

      ;;

    max)

      extra_flags="$ppc_cflags $fast_cflags"

      extra_configs="$max_configs"

      ;;

    debug)

      extra_flags="$ppc_cflags $debug_cflags"

      c_warnings="$c_warnings $debug_extra_warnings"

      cxx_warnings="$cxx_warnings $debug_extra_warnings"

      extra_configs="$debug_configs"

      ;;

    debug-max)

      extra_flags="$ppc_cflags $debug_cflags $max_cflags"

      c_warnings="$c_warnings $debug_extra_warnings"

      cxx_warnings="$cxx_warnings $debug_extra_warnings"

      extra_configs="$debug_configs $max_configs"

      ;;

    *)

      echo "You need to give an argument, 'standard', 'max', 'debug' or 'debug-max'"

      echo "Like: MODE=standard BUILD/compile-darwin-codewarrior"

      exit 1

      ;;

  esac

fi



extra_configs="$extra_configs --with-darwin-mwcc"



. "$path/FINISH.sh"

BitKeeper/etc/logging_ok

+5 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ hf@bisonxp.(none) 
hf@deer.(none)

hf@deer.mysql.r18.ru

hf@genie.(none)

holyfoot@mysql.com

igor@hundin.mysql.fi

igor@linux.local

igor@rurik.mysql.com
@@ -96,6 +97,7 @@ jani@dsl-jkl1657.dial.inet.fi 
jani@dsl-kpogw4gb5.dial.inet.fi

jani@hynda.(none)

jani@hynda.mysql.fi

jani@ibmlab.site

jani@janikt.pp.saunalahti.fi

jani@linux.local

jani@rhols221.adsl.netsonic.fi
@@ -186,6 +188,7 @@ mysqldev@build.mysql2.com 
mysqldev@melody.local

mysqldev@mysql.com

mysqldev@o2k.irixworld.net

ndbdev@dl145b.mysql.com

ndbdev@eel.hemma.oreland.se

ndbdev@ndbmaster.mysql.com

ndbdev@shark.
@@ -219,6 +222,7 @@ ram@deer.(none) 
ram@gw.mysql.r18.ru

ram@gw.udmsearch.izhnet.ru

ram@mysql.r18.ru

ram@ram-book.(none)

ram@ram.(none)

ramil@mysql.com

ranger@regul.home.lan
@@ -242,6 +246,7 @@ serg@serg.mysql.com 
serg@sergbook.mylan

serg@sergbook.mysql.com

sergefp@mysql.com

shuichi@mysql.com

sinisa@rhols221.adsl.netsonic.fi

stewart@mysql.com

svoj@mysql.com

cmd-line-utils/libedit/config.h

+2 −0
Original line number Diff line number Diff line
@@ -2,8 +2,10 @@ 
#include "my_config.h"

#include "sys.h"



#if defined(LIBC_SCCS) && !defined(lint)

#define __RCSID(x)

#define __COPYRIGHT(x)

#endif

#define __RENAME(x)

#define _DIAGASSERT(x)

cmd-line-utils/readline/terminal.c

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ get_term_capabilities (bp) 
  register unsigned int i;



  for (i = 0; i < NUM_TC_STRINGS; i++)

#  ifdef __LCC__

#  if defined(__LCC__) || defined(__MWERKS__)

    *(tc_strings[i].tc_value) = tgetstr ((char *)tc_strings[i].tc_var, bp);

#  else

    *(tc_strings[i].tc_value) = tgetstr (tc_strings[i].tc_var, bp);

config/ac-macros/misc.m4

+17 −0
Original line number Diff line number Diff line
@@ -693,3 +693,20 @@ dnl --------------------------------------------------------------------------- 
dnl END OF MYSQL_CHECK_BIG_TABLES SECTION

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



dnl MYSQL_NEEDS_MYSYS_NEW

AC_DEFUN([MYSQL_NEEDS_MYSYS_NEW],

[AC_CACHE_CHECK([needs mysys_new helpers], mysql_use_mysys_new,

[

AC_LANG_PUSH(C++)

AC_TRY_LINK([], [

class A { public: int b; }; A *a=new A; a->b=10; delete a;

], mysql_use_mysys_new=no, mysql_use_mysys_new=yes)

AC_LANG_POP(C++)

])

if test "$mysql_use_mysys_new" = "yes"

then

  AC_DEFINE([USE_MYSYS_NEW], [1], [Needs to use mysys_new helpers])

fi

])