From d3677c872f2d7d807dffbf8cd4aaa8fb6d7723a4 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 8 Oct 2014 00:45:41 +0200 Subject: jemalloc compatibility --- include/my_bitmap.h | 1 + sql/mysqld.cc | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/my_bitmap.h b/include/my_bitmap.h index 06f43f79df8..7bed045bd86 100644 --- a/include/my_bitmap.h +++ b/include/my_bitmap.h @@ -42,6 +42,7 @@ typedef struct st_bitmap extern "C" { #endif extern void create_last_word_mask(MY_BITMAP *map); +#define bitmap_init(A,B,C,D) my_bitmap_init(A,B,C,D) extern my_bool bitmap_init(MY_BITMAP *map, my_bitmap_map *buf, uint n_bits, my_bool thread_safe); extern my_bool bitmap_is_clear_all(const MY_BITMAP *map); diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 09b0b0baf28..52b56f121c5 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -363,7 +363,8 @@ static DYNAMIC_ARRAY all_options; /* Global variables */ bool opt_bin_log, opt_bin_log_used=0, opt_ignore_builtin_innodb= 0; -my_bool opt_log, opt_slow_log, debug_assert_if_crashed_table= 0, opt_help= 0, opt_abort; +my_bool opt_log, opt_slow_log, debug_assert_if_crashed_table= 0, opt_help= 0; +static my_bool opt_abort; ulonglong log_output_options; my_bool opt_userstat_running; my_bool opt_log_queries_not_using_indexes= 0; -- cgit v1.2.1