diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-12-20 19:47:31 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-12-20 19:47:31 +0100 |
| commit | aade6e53d398dd287ca7e771191c9975099b4fa1 (patch) | |
| tree | 73cf16939986ad8d572982b88ac45386eda42ad7 | |
| parent | 1f1e3ce8a18ab548f9641ea10295372abbd147ad (diff) | |
| download | mariadb-git-aade6e53d398dd287ca7e771191c9975099b4fa1.tar.gz | |
fix a bad merge
in 10.1+ one should use
MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-address-of-packed-member")
and it's already done in storage/tokudb/PerconaFT/CMakeLists.txt
| -rw-r--r-- | storage/tokudb/CMakeLists.txt | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/storage/tokudb/CMakeLists.txt b/storage/tokudb/CMakeLists.txt index 7313a4dcce4..618d257be29 100644 --- a/storage/tokudb/CMakeLists.txt +++ b/storage/tokudb/CMakeLists.txt @@ -49,12 +49,6 @@ MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-vla" DEBUG) MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-implicit-fallthrough") MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-cpp" DEBUG) -CHECK_C_COMPILER_FLAG("-Wno-address-of-packed-member" HAVE_NO_ADDRESS_PACKED) -IF(HAVE_NO_ADDRESS_PACKED) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-address-of-packed-member") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-address-of-packed-member") -ENDIF() - ############################################ SET(TOKUDB_DEB_FILES "usr/lib/mysql/plugin/ha_tokudb.so\netc/mysql/conf.d/tokudb.cnf\nusr/bin/tokuftdump" PARENT_SCOPE) MARK_AS_ADVANCED(BUILDNAME) |