diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-06-12 12:52:51 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-06-12 12:52:51 +0300 |
| commit | 2f6c43c5a02482ba92f2d463a6f5bf6383f0ec51 (patch) | |
| tree | db7de364099a85fa6c7e658bd981ac63b4118576 /sql | |
| parent | ff0b30219f8b47b70f14211c1180148de3dee4d1 (diff) | |
| download | mariadb-git-2f6c43c5a02482ba92f2d463a6f5bf6383f0ec51.tar.gz | |
Fixed warning that sf_malloc_trough_check was not used when compiling without SAFEMALLOC
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 2a5ce27d649..51824d23a14 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -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_short_log_format= 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; ulong thread_created; uint thread_handling; @@ -444,6 +444,9 @@ static const char *optimizer_switch_str="index_merge=on,index_merge_union=on," #else ; #endif +#ifdef SAFEMALLOC +my_bool sf_malloc_trough_check= 0; +#endif static char *mysqld_user, *mysqld_chroot, *log_error_file_ptr; static char *opt_init_slave, *language_ptr, *opt_init_connect; static char *default_character_set_name; @@ -6898,7 +6901,7 @@ each time the SQL thread starts.", {"skip-networking", OPT_SKIP_NETWORKING, "Don't allow connection with TCP/IP.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, -#if !defined(DBUG_OFF) && defined(SAFEMALLOC) +#ifdef SAFEMALLOC {"safemalloc", OPT_SAFEMALLOC, "Check all memory allocation for every malloc/free call.", &sf_malloc_trough_check, &sf_malloc_trough_check, 0, |