Merge branch '10.7' into 10.8
This commit is contained in:
commit
9aea73f74f
@ -5,6 +5,10 @@ if("NO" STREQUAL "${PLUGIN_COLUMNSTORE}")
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS)
|
add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS)
|
||||||
|
IF(NOT PLUGIN_PERFSCHEMA STREQUAL NO)
|
||||||
|
add_definitions(-DHAVE_PSI_INTERFACE=)
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
|
|
||||||
# this does everything, gets the var from the correct scope, appends new
|
# this does everything, gets the var from the correct scope, appends new
|
||||||
# values, sets in the correct scope
|
# values, sets in the correct scope
|
||||||
|
Loading…
x
Reference in New Issue
Block a user