summaryrefslogtreecommitdiff
path: root/client/mysqlbinlog.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-08-13 18:57:00 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-08-13 18:57:00 +0300
commit624dd71b9419555eca8baadc695e3376de72286f (patch)
tree31aaab8aeac43f921638407ab82190dd05a72793 /client/mysqlbinlog.cc
parentd4d865fcc8083782b6e4419c69bec372cd0b4142 (diff)
parente9c1701e11e2441435223cc7c00c467f58aaff19 (diff)
downloadmariadb-git-624dd71b9419555eca8baadc695e3376de72286f.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'client/mysqlbinlog.cc')
-rw-r--r--client/mysqlbinlog.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index f2f57f6e0bb..19973724a82 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -94,7 +94,8 @@ static const char *default_dbug_option = "d:t:o,/tmp/mysqlbinlog.trace";
const char *current_dbug_option= default_dbug_option;
#endif
static const char *load_groups[]=
-{ "mysqlbinlog", "client", "client-server", "client-mariadb", 0 };
+{ "mysqlbinlog", "mariadb-binlog", "client", "client-server", "client-mariadb",
+ 0 };
static void error(const char *format, ...) ATTRIBUTE_FORMAT(printf, 1, 2);
static void warning(const char *format, ...) ATTRIBUTE_FORMAT(printf, 1, 2);
@@ -1545,6 +1546,7 @@ end:
{
my_fwrite(result_file, (const uchar *) tmp_str.str, tmp_str.length,
MYF(MY_NABP));
+ fflush(result_file);
my_free(tmp_str.str);
}
}