From: Marc Alff
Date: July 14 2010 3:57pm
Subject: bzr commit into mysql-trunk-bugfixing branch (marc.alff:3105)
List-Archive: http://lists.mysql.com/commits/113599
Message-Id: <20100714155759.95F0F45E80@linux-su11.site>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3574922434240062409=="

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

#At file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-55087/ based on revid:marc.alff@stripped

 3105 Marc Alff	2010-07-14 [merge]
      local merge

    renamed:
      mysql-test/r/analyse.result => mysql-test/r/func_analyse.result
      mysql-test/t/analyse.test => mysql-test/t/func_analyse.test
    modified:
      BUILD/build_mccge.sh
      cmake/package_name.cmake
      sql/sql_class.h
=== modified file 'BUILD/build_mccge.sh'
--- a/BUILD/build_mccge.sh	2010-07-08 21:20:08 +0000
+++ b/BUILD/build_mccge.sh	2010-07-13 17:34:32 +0000
@@ -1066,7 +1066,6 @@ set_with_debug_flags()
   if test "x$with_debug_flag" = "xyes" ; then
     if test "x$developer_flag" = "xyes" ; then
       loc_debug_flags="-DUNIV_MUST_NOT_INLINE -DEXTRA_DEBUG -DFORCE_INIT_OF_VARS "
-      loc_debug_flags="$loc_debug_flags"
       compiler_flags="$compiler_flags $loc_debug_flags"
     fi
   fi

=== modified file 'cmake/package_name.cmake'
--- a/cmake/package_name.cmake	2010-02-10 19:23:24 +0000
+++ b/cmake/package_name.cmake	2010-07-13 17:34:32 +0000
@@ -26,11 +26,10 @@ IF(NOT VERSION)
     SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 1)
     SET(DEFAULT_PLATFORM ${CMAKE_SYSTEM_NAME})
     SET(DEFAULT_MACHINE  ${CMAKE_SYSTEM_PROCESSOR})
-    MESSAGE("SIZEOF_VOIDP=${SIZEOF_VOIDP}")
     IF(SIZEOF_VOIDP EQUAL 8)
       SET(64BIT 1)
     ENDIF()
-  
+
     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
       SET(DEFAULT_PLATFORM "win")

=== renamed file 'mysql-test/r/analyse.result' => 'mysql-test/r/func_analyse.result'
=== renamed file 'mysql-test/t/analyse.test' => 'mysql-test/t/func_analyse.test'
=== modified file 'sql/sql_class.h'
--- a/sql/sql_class.h	2010-07-08 21:20:08 +0000
+++ b/sql/sql_class.h	2010-07-13 09:13:06 +0000
@@ -2459,7 +2459,12 @@ public:
   /** Return FALSE if connection to client is broken. */
   bool is_connected()
   {
-    return vio_ok() ? vio_is_connected(net.vio) : FALSE;
+    /*
+      All system threads (e.g., the slave IO thread) are connected but
+      not using vio. So this function always returns true for all
+      system threads.
+    */
+    return system_thread || (vio_ok() ? vio_is_connected(net.vio) : FALSE);
   }
 #else
   inline bool vio_ok() const { return TRUE; }


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-\
#   55087/
# testament_sha1: 7969326168a7a13b2d89a59eda17179165578563
# timestamp: 2010-07-14 09:57:59 -0600
# base_revision_id: marc.alff@stripped\
#   01pf0kvvmoh22sxs
# 
# Begin bundle
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
/i7kinChIO3wIXQ=


--===============3574922434240062409==--