database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2019-04-27 20:41:31 +03:00
parent acf6f92aa9 00377147e3
commit 4d59f45260
39 changed files with 547 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/mysqlbinlog.cc
View File

@@ -1,6 +1,6 @@
/*
Copyright (c) 2000, 2014, Oracle and/or its affiliates.
Copyright (c) 2009, 2014, MariaDB
Copyright (c) 2009, 2019, MariaDB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -233,9 +233,8 @@ bool print_annotate_event(PRINT_EVENT_INFO *print_event_info)
bool error= 0;
if (annotate_event)
{
error= annotate_event->print(result_file, print_event_info);
delete annotate_event; // the event should not be printed more than once
annotate_event= 0;
annotate_event->print(result_file, print_event_info);
free_annotate_event();
}
return error;
}
@@ -1553,8 +1552,6 @@ end:
}
}
if (remote_opt)
ev->temp_buf= 0;
if (destroy_evt) /* destroy it later if not set (ignored table map) */
delete ev;
}