local merge

BUILD/build_mccge.sh

@@ -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

cmake/package_name.cmake

@@ -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")

sql/sql_class.h

@@ -2459,7 +2459,12 @@ class THD :public Statement,
   /** 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; }