Commit a1db0e72 authored by unknown's avatar unknown
Browse files

Merge trift2.:/MySQL/M51/clone-5.1 

into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
parents 40a3f6f7 c3571539

Docs/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ INSTALL-BINARY: mysql.info $(GT) 
# It is not in BitKeeper, but is downloaded from intranet by Bootstrap.

dist-hook:

	if [ -e $(srcdir)/manual.chm ] ; then \

	  cp $(srcdir)/manual.chm $(distdir); \

	  cp -f $(srcdir)/manual.chm $(distdir); \

	fi



# Don't update the files from bitkeeper

client/CMakeLists.txt

+3 −0
Original line number Diff line number Diff line
@@ -65,6 +65,9 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlclient mysys dbug yassl taocrypt zlib wsock 
ADD_EXECUTABLE(mysqlimport mysqlimport.c)

TARGET_LINK_LIBRARIES(mysqlimport mysqlclient mysys dbug yassl taocrypt zlib wsock32)



ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)

TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient mysys dbug yassl taocrypt zlib wsock32)



ADD_EXECUTABLE(mysqlshow mysqlshow.c)

TARGET_LINK_LIBRARIES(mysqlshow mysqlclient mysys dbug yassl taocrypt zlib wsock32)

config/ac-macros/plugins.m4

+32 −0
Original line number Diff line number Diff line
@@ -253,6 +253,29 @@ AC_DEFUN([MYSQL_PLUGIN_ACTIONS],[ 
 ])

])



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

dnl Macro: MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS

dnl

dnl SYNOPSIS

dnl   MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS([name],[file name])

dnl

dnl DESCRIPTION

dnl   Some modules in plugins keep dependance on structures

dnl   declared in sql/ (THD class usually)

dnl   That has to be fixed in the future, but until then

dnl   we have to recompile these modules when we want to

dnl   to compile server parts with the different #defines

dnl   Normally it happens when we compile the embedded server

dnl   Thus one should mark such files in his handler using this macro

dnl    (currently only one such a file per plugin is supported)

dnl

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



AC_DEFUN([MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS],[

 MYSQL_REQUIRE_PLUGIN([$1])

 m4_define([MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS_]AS_TR_CPP([$1]), [$2])

])



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

dnl Macro: MYSQL_CONFIGURE_PLUGINS

dnl
@@ -282,6 +305,9 @@ AC_DEFUN([MYSQL_CONFIGURE_PLUGINS],[ 
    AC_SUBST([mysql_pg_dirs])

    AC_SUBST([mysql_se_unittest_dirs])

    AC_SUBST([mysql_pg_unittest_dirs])

    AC_SUBST([condition_dependent_plugin_modules])

    AC_SUBST([condition_dependent_plugin_links])

    AC_SUBST([condition_dependent_plugin_includes])

   ])

 ])

])
@@ -307,6 +333,7 @@ AC_DEFUN([_MYSQL_EMIT_CHECK_PLUGIN],[ 
  [MYSQL_PLUGIN_DYNAMIC_]AS_TR_CPP([$1]),

  [MYSQL_PLUGIN_MANDATORY_]AS_TR_CPP([$1]),

  [MYSQL_PLUGIN_DISABLED_]AS_TR_CPP([$1]),

  [MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS_]AS_TR_CPP([$1]),

  [MYSQL_PLUGIN_ACTIONS_]AS_TR_CPP([$1])

 )

])
@@ -402,6 +429,11 @@ dnl Although this is "pretty", it breaks libmysqld build 
      mysql_plugin_defs="$mysql_plugin_defs, [builtin_]$2[_plugin]"

      [with_plugin_]$2=yes

      AC_MSG_RESULT([yes])

      m4_ifdef([$11],[

       condition_dependent_plugin_modules="$condition_dependent_plugin_modules m4_bregexp($11, [[^/]+$], [\&])"

       condition_dependent_plugin_links="$condition_dependent_plugin_links $6/$11"

       condition_dependent_plugin_includes="$condition_dependent_plugin_includes -I[\$(top_srcdir)]/$6/m4_bregexp($11, [^.+[/$]], [\&])"

      ])

    fi

    m4_ifdef([$6],[

      if test -n "$mysql_use_plugin_dir" ; then

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -1441,9 +1441,9 @@ fi 
# dlopen, dlerror

case "$with_mysqld_ldflags " in



  *"-static "*)

  *"-all-static "*)

    # No need to check for dlopen when mysqld is linked with

    # -all-static or -static as it won't be able to load any functions.

    # -all-static as it won't be able to load any functions.

    # NOTE! It would be better if it was possible to test if dlopen

    # can be used, but a good way to test it couldn't be found

include/my_global.h

+7 −2
Original line number Diff line number Diff line
@@ -614,12 +614,17 @@ C_MODE_END 
#define _STATIC_VARARGS(X) X

#define _PC(X)	X



/* The DBUG_ON flag always takes precedence over default DBUG_OFF */

#if defined(DBUG_ON) && defined(DBUG_OFF)

#undef DBUG_OFF

#endif



#if defined(_lint) && !defined(DBUG_OFF)

/* We might be forced to turn debug off, if not turned off already */

#if (defined(FORCE_DBUG_OFF) || defined(_lint)) && !defined(DBUG_OFF)

#  define DBUG_OFF

#  ifdef DBUG_ON

#    undef DBUG_ON

#  endif

#endif



#include <my_dbug.h>