summaryrefslogtreecommitdiff
path: root/sql/log.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-12-13 16:58:58 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2022-12-13 16:58:58 +0200
commita8a5c8a1b8ac566241d43a85de90c11f5d1568d9 (patch)
treef619f2a7ed54abbc9edd42b77f5b63caa6ec65ac /sql/log.cc
parent04efe13501246e490932d4be7bca90e207e0b5e2 (diff)
parent1dc2f35598193fc52b79061c286b61f01c617374 (diff)
downloadmariadb-git-a8a5c8a1b8ac566241d43a85de90c11f5d1568d9.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'sql/log.cc')
-rw-r--r--sql/log.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc
index b8f8d3daae7..4fff1e3d3aa 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -11677,7 +11677,7 @@ static int show_binlog_vars(THD *thd, SHOW_VAR *var, void *,
}
static SHOW_VAR binlog_status_vars_top[]= {
- {"Binlog", (char *) &show_binlog_vars, SHOW_FUNC},
+ SHOW_FUNC_ENTRY("Binlog", &show_binlog_vars),
{NullS, NullS, SHOW_LONG}
};