diff options
Diffstat (limited to 'client/mysqlbinlog.cc')
| -rw-r--r-- | client/mysqlbinlog.cc | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 47a7f9e01b2..309743723cc 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -61,6 +61,9 @@ extern "C" unsigned char *mysql_net_store_length(unsigned char *packet, size_t length); #define net_store_length mysql_net_store_length +#define key_memory_TABLE_RULE_ENT 0 +#define key_memory_rpl_filter 0 + Rpl_filter *binlog_filter= 0; #define BIN_LOG_HEADER_SIZE 4 @@ -196,7 +199,7 @@ Log_event* read_remote_annotate_event(uchar* net_buf, ulong event_len, uchar *event_buf; Log_event* event; - if (!(event_buf= (uchar*) my_malloc(event_len + 1, MYF(MY_WME)))) + if (!(event_buf= (uchar*) my_malloc(PSI_NOT_INSTRUMENTED, event_len + 1, MYF(MY_WME)))) { error("Out of memory"); return 0; @@ -308,7 +311,7 @@ public: int init() { - return my_init_dynamic_array(&file_names, sizeof(File_name_record), + return my_init_dynamic_array(&file_names, PSI_NOT_INSTRUMENTED, sizeof(File_name_record), 100, 100, MYF(0)); } @@ -543,7 +546,7 @@ Exit_status Load_log_processor::process_first_event(const char *bname, File_name_record rec; DBUG_ENTER("Load_log_processor::process_first_event"); - if (!(fname= (char*) my_malloc(full_len,MYF(MY_WME)))) + if (!(fname= (char*) my_malloc(PSI_NOT_INSTRUMENTED, full_len,MYF(MY_WME)))) { error("Out of memory."); delete ce; @@ -1958,7 +1961,7 @@ get_one_option(const struct my_option *opt, char *argument, const char *) { my_free(pass); char *start=argument; - pass= my_strdup(argument,MYF(MY_FAE)); + pass= my_strdup(PSI_NOT_INSTRUMENTED, argument,MYF(MY_FAE)); while (*argument) *argument++= 'x'; /* Destroy argument */ if (*start) start[1]=0; /* Cut length of argument */ @@ -3044,9 +3047,9 @@ int main(int argc, char** argv) if (opt_flashback) { - my_init_dynamic_array(&binlog_events, sizeof(LEX_STRING), 1024, 1024, + my_init_dynamic_array(&binlog_events, PSI_NOT_INSTRUMENTED, sizeof(LEX_STRING), 1024, 1024, MYF(0)); - my_init_dynamic_array(&events_in_stmt, sizeof(Rows_log_event*), 1024, 1024, + my_init_dynamic_array(&events_in_stmt, PSI_NOT_INSTRUMENTED, sizeof(Rows_log_event*), 1024, 1024, MYF(0)); } if (opt_stop_never) @@ -3095,7 +3098,7 @@ int main(int argc, char** argv) retval= ERROR_STOP; goto err; } - dirname_for_local_load= my_strdup(my_tmpdir(&tmpdir), MY_WME); + dirname_for_local_load= my_strdup(PSI_NOT_INSTRUMENTED, my_tmpdir(&tmpdir), MY_WME); } if (load_processor.init()) |