diff options
| author | Christopher Powers <christopher.powers@sun.com> | 2009-11-10 13:41:43 -0600 |
|---|---|---|
| committer | Christopher Powers <christopher.powers@sun.com> | 2009-11-10 13:41:43 -0600 |
| commit | e0cb24c3c7fb10ba68c3dcbd4f3274edcc01ecf3 (patch) | |
| tree | c15ce2492d13e0054ba9329863d6a0a7244f8181 /storage | |
| parent | 313c5a01eea6fe4ab528066a7b14fe6b63e2c633 (diff) | |
| download | mariadb-git-e0cb24c3c7fb10ba68c3dcbd4f3274edcc01ecf3.tar.gz | |
Bug#47382 'mysqladmin debug' crash on 64-bit Windows
The crash occurs because SAFEMALLOC is defined for the MySQL server
but not for the Archive or Federated engines, resulting in a
parameter mismatch between the function prototype and definition
for functions using the CALLER_INFO macro.
storage/archive/CMakeLists.txt:
Set SAFEMALLOC by default to be consistent with the server.
storage/federated/CMakeLists.txt:
Set SAFEMALLOC by default to be consistent with the server.
Diffstat (limited to 'storage')
| -rwxr-xr-x[-rw-r--r--] | storage/archive/CMakeLists.txt | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | storage/federated/CMakeLists.txt | 9 |
2 files changed, 9 insertions, 3 deletions
diff --git a/storage/archive/CMakeLists.txt b/storage/archive/CMakeLists.txt index ce4d92d3f99..f4492c3ce77 100644..100755 --- a/storage/archive/CMakeLists.txt +++ b/storage/archive/CMakeLists.txt @@ -13,6 +13,9 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") +SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") + INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake") SET(ARCHIVE_SOURCES azio.c ha_archive.cc ha_archive.h) MYSQL_STORAGE_ENGINE(ARCHIVE) diff --git a/storage/federated/CMakeLists.txt b/storage/federated/CMakeLists.txt index fa54d36481a..d371c0fc02b 100644..100755 --- a/storage/federated/CMakeLists.txt +++ b/storage/federated/CMakeLists.txt @@ -1,18 +1,21 @@ # Copyright (C) 2006 MySQL AB -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") +SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") + INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake") SET(FEDERATED_SOURCES ha_federated.cc) MYSQL_STORAGE_ENGINE(FEDERATED) |