bzr commit into mysql-trunk-merge branch (tor.didriksen:3275)

[Tor Didriksen]

#At file:///export/home/didrik/repo/trunk-merge-bug52172suicide/ based on revid:dmitry.shulga@stripped

 3275 Tor Didriksen	2010-10-19 [merge]
      automerge from 5.5-bugteam

    modified:
      CMakeLists.txt
      config/ac-macros/maintainer.m4
      configure.in
      dbug/dbug.c
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2010-09-27 11:37:21 +0000
+++ b/CMakeLists.txt	2010-10-19 07:29:08 +0000
@@ -61,6 +61,8 @@ SET(BUILDTYPE_DOCSTRING
  
 IF(WITH_DEBUG)
   SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING ${BUILDTYPE_DOCSTRING} FORCE)
+  SET(MYSQL_MAINTAINER_MODE ON CACHE BOOL
+      "MySQL maintainer-specific development environment")
   SET(OLD_WITH_DEBUG 1 CACHE INTERNAL "" FORCE)
 ELSEIF(NOT HAVE_CMAKE_BUILD_TYPE OR OLD_WITH_DEBUG)
   IF(CUSTOM_C_FLAGS)

=== modified file 'config/ac-macros/maintainer.m4'
--- a/config/ac-macros/maintainer.m4	2010-09-24 12:36:31 +0000
+++ b/config/ac-macros/maintainer.m4	2010-10-18 16:27:10 +0000
@@ -8,7 +8,8 @@ AC_DEFUN([MY_MAINTAINER_MODE], [
     [AS_HELP_STRING([--enable-mysql-maintainer-mode],
                     [Enable a MySQL maintainer-specific development environment])],
     [USE_MYSQL_MAINTAINER_MODE=$enableval],
-    [USE_MYSQL_MAINTAINER_MODE=no])
+    [AS_IF([test "$with_debug" != "no"],
+      [USE_MYSQL_MAINTAINER_MODE=yes], [USE_MYSQL_MAINTAINER_MODE=no])])
   AC_MSG_RESULT([$USE_MYSQL_MAINTAINER_MODE])
 ])
 

=== modified file 'configure.in'
--- a/configure.in	2010-10-13 17:26:14 +0000
+++ b/configure.in	2010-10-19 07:29:08 +0000
@@ -118,6 +118,13 @@ AC_SUBST(SHARED_LIB_MAJOR_VERSION)
 AC_SUBST(SHARED_LIB_VERSION)
 AC_SUBST(AVAILABLE_LANGUAGES)
 
+# Check whether a debug mode should be enabled.
+AC_ARG_WITH([debug],
+    AS_HELP_STRING([--with-debug@<:@=full@:>@],
+      [Enable various amounts of debugging support (full adds a slow memory checker).]),
+    [with_debug=$withval],
+    [with_debug=no])
+
 # Whether the maintainer mode should be enabled.
 MY_MAINTAINER_MODE
 
@@ -1691,10 +1698,6 @@ then
   DEBUG_OPTIMIZE_CXX=""
 fi
 
-AC_ARG_WITH(debug,
-    [AS_HELP_STRING([--with-debug], [Add debug code @<:@default=no@:>@])],
-    [with_debug=$withval],
-    [with_debug=no])
 if test "$with_debug" = "yes"
 then
   AC_DEFINE([DBUG_ON], [1], [Use libdbug])

=== modified file 'dbug/dbug.c'
--- a/dbug/dbug.c	2010-10-18 11:31:18 +0000
+++ b/dbug/dbug.c	2010-10-19 07:29:08 +0000
@@ -2370,7 +2370,7 @@ static void DbugFlush(CODE_STATE *cs)
 
 void _db_flush_()
 {
-  CODE_STATE *cs;
+  CODE_STATE *cs= NULL;
   get_code_state_or_return;
   (void) fflush(cs->stack->out_file);
 }


Attachment: [text/bzr-bundle] bzr/[e-mail]