Commit 06ccf9de authored by unknown's avatar unknown
Browse files

Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release 

into  mysql.com:/Users/kent/mysql/bk/mysql-5.1


configure.in:
  Auto merged
parents e1ff81bb d30e4ebb

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)

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>

mysql-test/r/ps.result

+239 −222

File changed.

Preview size limit exceeded, changes collapsed.