From: Tor Didriksen
Date: October 19 2010 7:30am
Subject: bzr push into mysql-trunk-merge branch (tor.didriksen:3274 to 3275)
List-Archive: http://lists.mysql.com/commits/121061
Message-Id: <20101019073105.1335B37B0@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5883255127136639000=="

--===============5883255127136639000==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 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
 3274 Dmitry Shulga	2010-10-18 [merge]
      Auto-merge from mysql-5.5-bugteam for bug#36742.

    modified:
      mysql-test/r/ipv4_as_ipv6.result
=== 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);
 }


--===============5883255127136639000==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/tor.didriksen@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   hncns5y3xtzawxr2
# target_branch: file:///export/home/didrik/repo/trunk-merge-\
#   bug52172suicide/
# testament_sha1: a3a879b997c2c3d3473aa9c7a3afcca984ff66ef
# timestamp: 2010-10-19 09:31:04 +0200
# source_branch: file:///export/home/didrik/repo/5.5-bugteam-\
#   bug52172suicide/
# base_revision_id: dmitry.shulga@stripped\
#   euiyvubyo1hkj6yd
# 
# Begin bundle
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
0rYExTyeT/8XckU4UJBLHkE9


--===============5883255127136639000==--