1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

local merge

Browse Source
This commit is contained in:
Marc Alff 2010-07-14 09:57:50 -06:00
commit adf29ed689
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BUILD/build_mccge.sh
View File

@ -1066,7 +1066,6 @@ set_with_debug_flags()
if test "x$with_debug_flag" = "xyes" ; then if test "x$with_debug_flag" = "xyes" ; then
if test "x$developer_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="-DUNIV_MUST_NOT_INLINE -DEXTRA_DEBUG -DFORCE_INIT_OF_VARS "
loc_debug_flags="$loc_debug_flags"
compiler_flags="$compiler_flags $loc_debug_flags" compiler_flags="$compiler_flags $loc_debug_flags"
fi fi
fi fi

1
cmake/package_name.cmake
View File

@ -26,7 +26,6 @@ IF(NOT VERSION)
SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 1) SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 1)
SET(DEFAULT_PLATFORM ${CMAKE_SYSTEM_NAME}) SET(DEFAULT_PLATFORM ${CMAKE_SYSTEM_NAME})
SET(DEFAULT_MACHINE ${CMAKE_SYSTEM_PROCESSOR}) SET(DEFAULT_MACHINE ${CMAKE_SYSTEM_PROCESSOR})
MESSAGE("SIZEOF_VOIDP=${SIZEOF_VOIDP}")
IF(SIZEOF_VOIDP EQUAL 8) IF(SIZEOF_VOIDP EQUAL 8)
SET(64BIT 1) SET(64BIT 1)
ENDIF() ENDIF()

0
mysql-test/r/analyse.result → mysql-test/r/func_analyse.result
View File

0
mysql-test/t/analyse.test → mysql-test/t/func_analyse.test
View File

7
sql/sql_class.h
View File

@ -2459,7 +2459,12 @@ public:
/** Return FALSE if connection to client is broken. */ /** Return FALSE if connection to client is broken. */
bool is_connected() 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 #else
inline bool vio_ok() const { return TRUE; } inline bool vio_ok() const { return TRUE; }