mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-20 15:25:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.2' into bb-10.2-ext

Browse source
This commit is contained in:
Sergei Golubchik 2017-08-25 10:25:48 +02:00
commit 27412877db
585 changed files with 79337 additions and 12280 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugin/aws_key_management/CMakeLists.txt
View file

@ -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)

6
plugin/semisync/semisync_master.cc
View file

@ -555,7 +555,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;
@ -663,7 +663,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++;
@ -674,7 +674,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;