summaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-08-26 00:34:43 +0200
committerSergei Golubchik <serg@mariadb.org>2017-08-26 00:34:43 +0200
commitbb8e99fdc367a470c6195a2ae4c33f273fe55a25 (patch)
tree3b3bcacec8faab66bf6756f20dff1e45462fdc1c /plugin
parentadd44e684cb9f1b46d1d5facdf6255360fa7b656 (diff)
parentc02d61bc11ee06b6043e6db9a15d00b9f40bce1f (diff)
downloadmariadb-git-bb8e99fdc367a470c6195a2ae4c33f273fe55a25.tar.gz
Merge branch 'bb-10.2-ext' into 10.3
Diffstat (limited to 'plugin')
-rw-r--r--plugin/aws_key_management/CMakeLists.txt10
-rw-r--r--plugin/semisync/semisync_master.cc6
2 files changed, 7 insertions, 9 deletions
diff --git a/plugin/aws_key_management/CMakeLists.txt b/plugin/aws_key_management/CMakeLists.txt
index f612bd39be0..33ac1b8716c 100644
--- a/plugin/aws_key_management/CMakeLists.txt
+++ b/plugin/aws_key_management/CMakeLists.txt
@@ -113,13 +113,10 @@ ELSE()
ENDFOREACH()
# To be compatible with older cmake, we use older version of the SDK
- # We increase the version for macs however, so the newest mac could built it.
- IF(APPLE)
- SET(GIT_TAG "1.0.100")
- ELSEIF(_OPENSSL_VERSION VERSION_EQUAL "1.1")
- SET(GIT_TAG "1.0.114")
+ IF(CMAKE_VERSION LESS "3.0")
+ SET(GIT_TAG "1.0.8")
ELSE()
- SET(GIT_TAG "1.0.8")
+ SET(GIT_TAG "1.1.27")
ENDIF()
SET(AWS_SDK_PATCH_COMMAND )
@@ -141,6 +138,7 @@ ELSE()
"-DCMAKE_CXX_FLAGS_MINSIZEREL=${CMAKE_CXX_FLAGS_MINSIZEREL} ${PIC_FLAG}"
${EXTRA_SDK_CMAKE_FLAGS}
-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/aws_sdk_cpp
+ -DCMAKE_INSTALL_LIBDIR=lib
TEST_COMMAND ""
)
SET_TARGET_PROPERTIES(aws_sdk_cpp PROPERTIES EXCLUDE_FROM_ALL TRUE)
diff --git a/plugin/semisync/semisync_master.cc b/plugin/semisync/semisync_master.cc
index 092ab38f6bf..975b2e13253 100644
--- a/plugin/semisync/semisync_master.cc
+++ b/plugin/semisync/semisync_master.cc
@@ -556,7 +556,7 @@ int ReplSemiSyncMaster::reportReplyBinlog(uint32 server_id,
if (need_copy_send_pos)
{
- strcpy(reply_file_name_, log_file_name);
+ strmake_buf(reply_file_name_, log_file_name);
reply_file_pos_ = log_file_pos;
reply_file_name_inited_ = true;
@@ -664,7 +664,7 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name,
if (cmp <= 0)
{
/* This thd has a lower position, let's update the minimum info. */
- strcpy(wait_file_name_, trx_wait_binlog_name);
+ strmake_buf(wait_file_name_, trx_wait_binlog_name);
wait_file_pos_ = trx_wait_binlog_pos;
rpl_semi_sync_master_wait_pos_backtraverse++;
@@ -675,7 +675,7 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name,
}
else
{
- strcpy(wait_file_name_, trx_wait_binlog_name);
+ strmake_buf(wait_file_name_, trx_wait_binlog_name);
wait_file_pos_ = trx_wait_binlog_pos;
wait_file_name_inited_ = true;