mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 12:32:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed warning that sf_malloc_trough_check was not used when compiling without SAFEMALLOC

Browse source
This commit is contained in:
Michael Widenius 2011-06-12 12:52:51 +03:00
parent ff0b30219f
commit 2f6c43c5a0
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sql/mysqld.cc
View file

@ -427,7 +427,7 @@ static bool volatile ready_to_exit;
static my_bool opt_debugging= 0, opt_external_locking= 0, opt_console= 0; static my_bool opt_debugging= 0, opt_external_locking= 0, opt_console= 0;
static my_bool opt_short_log_format= 0; static my_bool opt_short_log_format= 0;
static my_bool opt_ignore_wrong_options= 0, opt_expect_abort= 0; static my_bool opt_ignore_wrong_options= 0, opt_expect_abort= 0;
static my_bool opt_sync= 0, sf_malloc_trough_check= 0; static my_bool opt_sync= 0;
static uint kill_cached_threads, wake_thread; static uint kill_cached_threads, wake_thread;
ulong thread_created; ulong thread_created;
uint thread_handling; uint thread_handling;
@ -444,6 +444,9 @@ static const char *optimizer_switch_str="index_merge=on,index_merge_union=on,"
#else #else
; ;
#endif #endif
#ifdef SAFEMALLOC
my_bool sf_malloc_trough_check= 0;
#endif
static char *mysqld_user, *mysqld_chroot, *log_error_file_ptr; static char *mysqld_user, *mysqld_chroot, *log_error_file_ptr;
static char *opt_init_slave, *language_ptr, *opt_init_connect; static char *opt_init_slave, *language_ptr, *opt_init_connect;
static char *default_character_set_name; static char *default_character_set_name;
@ -6898,7 +6901,7 @@ each time the SQL thread starts.",
{"skip-networking", OPT_SKIP_NETWORKING, {"skip-networking", OPT_SKIP_NETWORKING,
"Don't allow connection with TCP/IP.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, "Don't allow connection with TCP/IP.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0,
0, 0, 0}, 0, 0, 0},
#if !defined(DBUG_OFF) && defined(SAFEMALLOC) #ifdef SAFEMALLOC
{"safemalloc", OPT_SAFEMALLOC, {"safemalloc", OPT_SAFEMALLOC,
"Check all memory allocation for every malloc/free call.", "Check all memory allocation for every malloc/free call.",
&sf_malloc_trough_check, &sf_malloc_trough_check, 0, &sf_malloc_trough_check, &sf_malloc_trough_check, 0,