diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-01-27 14:26:09 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-01-28 18:04:51 +0100 |
| commit | 64b5e94236e7c4246863fc70b91c346ba7b66b8b (patch) | |
| tree | ef2e794f0e609b71dc26a7af46046274c057f318 /client/mysqlbinlog.cc | |
| parent | 30ba31005793cdd9b596aabaf95110bb291dddcf (diff) | |
| download | mariadb-git-64b5e94236e7c4246863fc70b91c346ba7b66b8b.tar.gz | |
mysqlbinlog memory leaks
that failed main.mysqlbinlog
Diffstat (limited to 'client/mysqlbinlog.cc')
| -rw-r--r-- | client/mysqlbinlog.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 39a879bc619..e2b121c27a7 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -2877,9 +2877,6 @@ int main(int argc, char** argv) DBUG_ENTER("main"); DBUG_PROCESS(argv[0]); - (void) my_init_dynamic_array(&binlog_events, sizeof(LEX_STRING), 1024, 1024, - MYF(0)); - my_init_time(); // for time functions tzset(); // set tzname @@ -2917,6 +2914,10 @@ int main(int argc, char** argv) my_set_max_open_files(open_files_limit); + if (opt_flashback) + my_init_dynamic_array(&binlog_events, sizeof(LEX_STRING), 1024, 1024, + MYF(0)); + if (opt_stop_never) to_last_remote_log= TRUE; @@ -3029,8 +3030,8 @@ int main(int argc, char** argv) my_free(event_str->str); } fprintf(result_file, "COMMIT\n/*!*/;\n"); + delete_dynamic(&binlog_events); } - delete_dynamic(&binlog_events); /* Set delimiter back to semicolon */ if (!stop_event_string.is_empty()) |