From 3bc814bedaaa44ee69e47f74a9ebc196e0f44bd7 Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Sun, 9 Jun 2013 13:26:10 +0300 Subject: [PATCH] - Added -Wno-uninitialized to avoid warnings in release builds (uninitalized variables are detected by DBUG builds) - Fixed wrong declaration which cased compile failure on 32 bit cmake/build_configurations/mysql_release.cmake: Added -Wno-uninitialized to avoid warnings in release builds (uninitalized variables are detected by DBUG builds) include/maria.h: Fixed wrong declaration which cased compile failure on 32 bit include/myisam.h: Fixed wrong declaration which cased compile failure on 32 bit --- cmake/build_configurations/mysql_release.cmake | 4 ++-- include/maria.h | 2 +- include/myisam.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake index 5b2596491ad..2c225c75ce2 100644 --- a/cmake/build_configurations/mysql_release.cmake +++ b/cmake/build_configurations/mysql_release.cmake @@ -166,12 +166,12 @@ IF(UNIX) # Default GCC flags IF(CMAKE_COMPILER_IS_GNUCC) - SET(COMMON_C_FLAGS "-g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing") + SET(COMMON_C_FLAGS "-g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing -Wno-uninitialized") SET(CMAKE_C_FLAGS_DEBUG "-O ${COMMON_C_FLAGS}") SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}") ENDIF() IF(CMAKE_COMPILER_IS_GNUCXX) - SET(COMMON_CXX_FLAGS "-g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing") + SET(COMMON_CXX_FLAGS "-g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing -Wno-uninitialized") SET(CMAKE_CXX_FLAGS_DEBUG "-O ${COMMON_CXX_FLAGS}") SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}") ENDIF() diff --git a/include/maria.h b/include/maria.h index cb2f92e8a35..aba5d508070 100644 --- a/include/maria.h +++ b/include/maria.h @@ -387,7 +387,7 @@ void maria_disable_non_unique_index(MARIA_HA *info, ha_rows rows); my_bool maria_test_if_sort_rep(MARIA_HA *info, ha_rows rows, ulonglong key_map, my_bool force); -int maria_init_bulk_insert(MARIA_HA *info, ulong cache_size, ha_rows rows); +int maria_init_bulk_insert(MARIA_HA *info, size_t cache_size, ha_rows rows); void maria_flush_bulk_insert(MARIA_HA *info, uint inx); void maria_end_bulk_insert(MARIA_HA *info); int maria_preload(MARIA_HA *info, ulonglong key_map, my_bool ignore_leaves); diff --git a/include/myisam.h b/include/myisam.h index eaa6b2dbd1f..83402fe660f 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -407,7 +407,7 @@ void mi_disable_non_unique_index(MI_INFO *info, ha_rows rows); my_bool mi_test_if_sort_rep(MI_INFO *info, ha_rows rows, ulonglong key_map, my_bool force); -int mi_init_bulk_insert(MI_INFO *info, ulong cache_size, ha_rows rows); +int mi_init_bulk_insert(MI_INFO *info, size_t cache_size, ha_rows rows); void mi_flush_bulk_insert(MI_INFO *info, uint inx); void mi_end_bulk_insert(MI_INFO *info); int mi_assign_to_key_cache(MI_INFO *info, ulonglong key_map,