merging.
This commit is contained in:
commit
5a05c470ee
@ -32,26 +32,32 @@ IF(DEFINED CMAKE_BUILD_TYPE)
|
|||||||
SET(HAVE_CMAKE_BUILD_TYPE TRUE)
|
SET(HAVE_CMAKE_BUILD_TYPE TRUE)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
SET(CUSTOM_C_FLAGS $ENV{CFLAGS})
|
SET(CUSTOM_C_FLAGS $ENV{CFLAGS})
|
||||||
IF(NOT CUSTOM_C_FLAGS)
|
|
||||||
SET(CUSTOM_C_FLAGS ${CMAKE_C_FLAGS})
|
|
||||||
ENDIF()
|
|
||||||
|
|
||||||
OPTION(WITH_DEBUG "Use dbug" OFF)
|
OPTION(WITH_DEBUG "Use dbug/safemutex" OFF)
|
||||||
OPTION(WITH_DEBUG_FULL "Use dbug and safemalloc/safemutex. Slow" OFF)
|
OPTION(WITH_DEBUG_FULL "Use dbug and safemalloc/safemutex. Slow" OFF)
|
||||||
|
|
||||||
IF(NOT HAVE_CMAKE_BUILD_TYPE)
|
|
||||||
IF(BUILD_CONFIG OR NOT CUSTOM_C_FLAGS)
|
|
||||||
IF(WITH_DEBUG)
|
|
||||||
SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Debug build" FORCE)
|
|
||||||
ELSE()
|
|
||||||
SET(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING
|
|
||||||
"RelWithDebInfo build" FORCE)
|
|
||||||
ENDIF()
|
|
||||||
ENDIF()
|
|
||||||
ENDIF()
|
|
||||||
|
|
||||||
IF(WITH_DEBUG_FULL)
|
# We choose to provide WITH_DEBUG as alias to standard CMAKE_BUILD_TYPE=Debug
|
||||||
SET(WITH_DEBUG ON CACHE BOOL "Use DBUG")
|
# which turns out to be not trivial, as this involves synchronization
|
||||||
|
# between CMAKE_BUILD_TYPE and WITH_DEBUG. Besides, we have to deal with cases
|
||||||
|
# where WITH_DEBUG is reset from ON to OFF and here we need to reset
|
||||||
|
# CMAKE_BUILD_TYPE to either none or default RelWithDebInfo
|
||||||
|
|
||||||
|
SET(BUILDTYPE_DOCSTRING
|
||||||
|
"Choose the type of build, options are: None(CMAKE_CXX_FLAGS or
|
||||||
|
CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel")
|
||||||
|
|
||||||
|
IF(WITH_DEBUG OR WITH_DEBUG_FULL)
|
||||||
|
SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING ${BUILDTYPE_DOCSTRING} FORCE)
|
||||||
|
SET(OLD_WITH_DEBUG 1 CACHE INTERNAL "" FORCE)
|
||||||
|
ELSEIF(NOT HAVE_CMAKE_BUILD_TYPE OR OLD_WITH_DEBUG)
|
||||||
|
IF(CUSTOM_C_FLAGS)
|
||||||
|
SET(CMAKE_BUILD_TYPE "" CACHE STRING ${BUILDTYPE_DOCSTRING} FORCE)
|
||||||
|
ELSE(CMAKE_BUILD_TYPE MATCHES "Debug" OR NOT HAVE_CMAKE_BUILD_TYPE)
|
||||||
|
SET(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING
|
||||||
|
${BUILDTYPE_DOCSTRING} FORCE)
|
||||||
|
ENDIF()
|
||||||
|
SET(OLD_WITH_DEBUG 0 CACHE INTERNAL "" FORCE)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
IF(BUILD_CONFIG)
|
IF(BUILD_CONFIG)
|
||||||
|
@ -10,6 +10,7 @@ SELECT @start_session_value;
|
|||||||
SET @@global.optimizer_search_depth = 100;
|
SET @@global.optimizer_search_depth = 100;
|
||||||
Warnings:
|
Warnings:
|
||||||
Warning 1292 Truncated incorrect optimizer_search_depth value: '100'
|
Warning 1292 Truncated incorrect optimizer_search_depth value: '100'
|
||||||
|
Warning 1287 'optimizer-search-depth=63' is deprecated and will be removed in a future release. Please use a search depth less than 63 instead
|
||||||
SET @@global.optimizer_search_depth = DEFAULT;
|
SET @@global.optimizer_search_depth = DEFAULT;
|
||||||
SELECT @@global.optimizer_search_depth;
|
SELECT @@global.optimizer_search_depth;
|
||||||
@@global.optimizer_search_depth
|
@@global.optimizer_search_depth
|
||||||
@ -17,6 +18,7 @@ SELECT @@global.optimizer_search_depth;
|
|||||||
SET @@session.optimizer_search_depth = 200;
|
SET @@session.optimizer_search_depth = 200;
|
||||||
Warnings:
|
Warnings:
|
||||||
Warning 1292 Truncated incorrect optimizer_search_depth value: '200'
|
Warning 1292 Truncated incorrect optimizer_search_depth value: '200'
|
||||||
|
Warning 1287 'optimizer-search-depth=63' is deprecated and will be removed in a future release. Please use a search depth less than 63 instead
|
||||||
SET @@session.optimizer_search_depth = DEFAULT;
|
SET @@session.optimizer_search_depth = DEFAULT;
|
||||||
SELECT @@session.optimizer_search_depth;
|
SELECT @@session.optimizer_search_depth;
|
||||||
@@session.optimizer_search_depth
|
@@session.optimizer_search_depth
|
||||||
@ -44,6 +46,8 @@ SELECT @@global.optimizer_search_depth;
|
|||||||
@@global.optimizer_search_depth
|
@@global.optimizer_search_depth
|
||||||
62
|
62
|
||||||
SET @@global.optimizer_search_depth = 63;
|
SET @@global.optimizer_search_depth = 63;
|
||||||
|
Warnings:
|
||||||
|
Warning 1287 'optimizer-search-depth=63' is deprecated and will be removed in a future release. Please use a search depth less than 63 instead
|
||||||
SELECT @@global.optimizer_search_depth;
|
SELECT @@global.optimizer_search_depth;
|
||||||
@@global.optimizer_search_depth
|
@@global.optimizer_search_depth
|
||||||
63
|
63
|
||||||
@ -61,6 +65,8 @@ SELECT @@session.optimizer_search_depth;
|
|||||||
@@session.optimizer_search_depth
|
@@session.optimizer_search_depth
|
||||||
62
|
62
|
||||||
SET @@session.optimizer_search_depth = 63;
|
SET @@session.optimizer_search_depth = 63;
|
||||||
|
Warnings:
|
||||||
|
Warning 1287 'optimizer-search-depth=63' is deprecated and will be removed in a future release. Please use a search depth less than 63 instead
|
||||||
SELECT @@session.optimizer_search_depth;
|
SELECT @@session.optimizer_search_depth;
|
||||||
@@session.optimizer_search_depth
|
@@session.optimizer_search_depth
|
||||||
63
|
63
|
||||||
@ -68,6 +74,7 @@ SELECT @@session.optimizer_search_depth;
|
|||||||
SET @@global.optimizer_search_depth = 64;
|
SET @@global.optimizer_search_depth = 64;
|
||||||
Warnings:
|
Warnings:
|
||||||
Warning 1292 Truncated incorrect optimizer_search_depth value: '64'
|
Warning 1292 Truncated incorrect optimizer_search_depth value: '64'
|
||||||
|
Warning 1287 'optimizer-search-depth=63' is deprecated and will be removed in a future release. Please use a search depth less than 63 instead
|
||||||
SELECT @@global.optimizer_search_depth;
|
SELECT @@global.optimizer_search_depth;
|
||||||
@@global.optimizer_search_depth
|
@@global.optimizer_search_depth
|
||||||
63
|
63
|
||||||
@ -80,6 +87,7 @@ SELECT @@global.optimizer_search_depth;
|
|||||||
SET @@global.optimizer_search_depth = 65536;
|
SET @@global.optimizer_search_depth = 65536;
|
||||||
Warnings:
|
Warnings:
|
||||||
Warning 1292 Truncated incorrect optimizer_search_depth value: '65536'
|
Warning 1292 Truncated incorrect optimizer_search_depth value: '65536'
|
||||||
|
Warning 1287 'optimizer-search-depth=63' is deprecated and will be removed in a future release. Please use a search depth less than 63 instead
|
||||||
SELECT @@global.optimizer_search_depth;
|
SELECT @@global.optimizer_search_depth;
|
||||||
@@global.optimizer_search_depth
|
@@global.optimizer_search_depth
|
||||||
63
|
63
|
||||||
@ -96,6 +104,7 @@ SELECT @@global.optimizer_search_depth;
|
|||||||
SET @@session.optimizer_search_depth = 64;
|
SET @@session.optimizer_search_depth = 64;
|
||||||
Warnings:
|
Warnings:
|
||||||
Warning 1292 Truncated incorrect optimizer_search_depth value: '64'
|
Warning 1292 Truncated incorrect optimizer_search_depth value: '64'
|
||||||
|
Warning 1287 'optimizer-search-depth=63' is deprecated and will be removed in a future release. Please use a search depth less than 63 instead
|
||||||
SELECT @@session.optimizer_search_depth;
|
SELECT @@session.optimizer_search_depth;
|
||||||
@@session.optimizer_search_depth
|
@@session.optimizer_search_depth
|
||||||
63
|
63
|
||||||
@ -110,6 +119,7 @@ ERROR 42000: Incorrect argument type to variable 'optimizer_search_depth'
|
|||||||
SET @@session.optimizer_search_depth = 65550;
|
SET @@session.optimizer_search_depth = 65550;
|
||||||
Warnings:
|
Warnings:
|
||||||
Warning 1292 Truncated incorrect optimizer_search_depth value: '65550'
|
Warning 1292 Truncated incorrect optimizer_search_depth value: '65550'
|
||||||
|
Warning 1287 'optimizer-search-depth=63' is deprecated and will be removed in a future release. Please use a search depth less than 63 instead
|
||||||
SELECT @@session.optimizer_search_depth;
|
SELECT @@session.optimizer_search_depth;
|
||||||
@@session.optimizer_search_depth
|
@@session.optimizer_search_depth
|
||||||
63
|
63
|
||||||
|
@ -66,7 +66,7 @@ ulong events_waits_history_per_thread;
|
|||||||
/** Number of instruments class per thread. */
|
/** Number of instruments class per thread. */
|
||||||
ulong instr_class_per_thread;
|
ulong instr_class_per_thread;
|
||||||
/** Number of locker lost. @sa LOCKER_STACK_SIZE. */
|
/** Number of locker lost. @sa LOCKER_STACK_SIZE. */
|
||||||
ulong locker_lost;
|
ulong locker_lost= 0;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Mutex instrumentation instances array.
|
Mutex instrumentation instances array.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user