diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-04-12 10:56:36 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-04-12 10:56:36 +0300 |
| commit | a05f423554d0825997c1ff3de7e49e981e84e882 (patch) | |
| tree | 6d052891bc395145e6aacfec3208a4d9dadf3728 | |
| parent | 937ec3c48d2068dfb76d47cb409eb19d38677da1 (diff) | |
| parent | 03dcec9a9ae0869b38518ec039f644e47850585d (diff) | |
| download | mariadb-git-a05f423554d0825997c1ff3de7e49e981e84e882.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into 10.3bb-10.3-janmerge
| -rw-r--r-- | cmake/cpack_rpm.cmake | 2 | ||||
| -rw-r--r-- | include/mysql/service_wsrep.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index 44438d99141..895d5941c29 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -277,7 +277,6 @@ IF(CMAKE_VERSION VERSION_GREATER "3.9.99") SET(CPACK_SOURCE_GENERATOR "RPM") SETA(CPACK_RPM_SOURCE_PKG_BUILD_PARAMS - "-DBUILD_CONFIG=mysql_release" "-DRPM=${RPM}" "-DCPACK_RPM_BUILD_SOURCE_DIRS_PREFIX=/usr/src/debug/${CPACK_RPM_PACKAGE_NAME}-${VERSION}" ) @@ -288,6 +287,7 @@ MACRO(ADDIF var) ENDIF() ENDMACRO() +ADDIF(CMAKE_BUILD_TYPE) ADDIF(BUILD_CONFIG) ADDIF(WITH_SSL) diff --git a/include/mysql/service_wsrep.h b/include/mysql/service_wsrep.h index 3148bb3d227..48f98661619 100644 --- a/include/mysql/service_wsrep.h +++ b/include/mysql/service_wsrep.h @@ -164,7 +164,7 @@ extern struct wsrep_service_st { #define wsrep_trx_order_before(T1,T2) wsrep_service->wsrep_trx_order_before_func(T1,T2) #define wsrep_unlock_rollback() wsrep_service->wsrep_unlock_rollback_func() #define wsrep_set_data_home_dir(A) wsrep_service->wsrep_set_data_home_dir_func(A) -#define wsrep_thd_is_applier(T) wsrep_service->wsrep_thd_is_applier(T) +#define wsrep_thd_is_applier(T) wsrep_service->wsrep_thd_is_applier_func(T) #define wsrep_debug get_wsrep_debug() #define wsrep_log_conflicts get_wsrep_log_conflicts() |