jemalloc compatibility

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);

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;