Skip to content

Commit 2e814d4

Browse files
author
Jan Lindström
committed
Merge InnoDB 5.7 from mysql-5.7.9.
Contains also MDEV-10547: Test multi_update_innodb fails with InnoDB 5.7 The failure happened because 5.7 has changed the signature of the bool handler::primary_key_is_clustered() const virtual function ("const" was added). InnoDB was using the old signature which caused the function not to be used. MDEV-10550: Parallel replication lock waits/deadlock handling does not work with InnoDB 5.7 Fixed mutexing problem on lock_trx_handle_wait. Note that rpl_parallel and rpl_optimistic_parallel tests still fail. MDEV-10156 : Group commit tests fail on 10.2 InnoDB (branch bb-10.2-jan) Reason: incorrect merge MDEV-10550: Parallel replication can't sync with master in InnoDB 5.7 (branch bb-10.2-jan) Reason: incorrect merge
1 parent 848d211 commit 2e814d4

File tree

835 files changed

+173885
-83591
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

835 files changed

+173885
-83591
lines changed

BUILD/SETUP.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ debug_cflags="-DEXTRA_DEBUG -DSAFE_MUTEX -DSAFEMALLOC"
170170
error_inject="--with-error-inject "
171171
#
172172
# Base C++ flags for all builds
173-
base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti"
173+
base_cxxflags="-felide-constructors -fexceptions -fno-rtti"
174174
#
175175
# Flags for optimizing builds.
176176
# Be as fast as we can be without losing our ability to backtrace.

configure.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
5656
# MySQL "canonical" GCC flags. At least -fno-rtti flag affects
5757
# ABI and cannot be simply removed.
5858
SET(CMAKE_CXX_FLAGS
59-
"${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti")
59+
"${CMAKE_CXX_FLAGS} -fno-rtti")
6060

6161
IF (CMAKE_EXE_LINKER_FLAGS MATCHES " -static "
6262
OR CMAKE_EXE_LINKER_FLAGS MATCHES " -static$")

extra/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@ IF(WITH_INNOBASE_STORAGE_ENGINE OR WITH_XTRADB_STORAGE_ENGINE)
7777
../storage/innobase/buf/buf0checksum.cc
7878
../storage/innobase/ut/ut0crc32.cc
7979
../storage/innobase/ut/ut0ut.cc
80+
../storage/innobase/buf/buf0buf.cc
8081
../storage/innobase/page/page0zip.cc
82+
../storage/innobase/os/os0file.cc
8183
)
8284

8385
IF(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")

0 commit comments

Comments
 (0)