List:Commits« Previous MessageNext Message »
From:Marc Alff Date:July 14 2010 3:57pm
Subject:bzr commit into mysql-trunk-bugfixing branch (marc.alff:3105)
View as plain text  
#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; }


Attachment: [text/bzr-bundle] bzr/marc.alff@oracle.com-20100714155750-qis6ehy2cl753qa4.bundle
Thread
bzr commit into mysql-trunk-bugfixing branch (marc.alff:3105) Marc Alff14 Jul