summaryrefslogtreecommitdiff
path: root/sql/mysql_install_db.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-02-11 09:26:53 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2021-02-11 09:26:53 +0200
commitb19ec8848c9463b86d62601dffb67c75e3dfbd70 (patch)
tree203f6bf23338813575214c23a8fee5a99f7ca2fb /sql/mysql_install_db.cc
parentbfb4761ca04704d68dba51f76d7c9967f880a6ee (diff)
parentc7edbe5bb1222634adb0c45ca86c62fb544ce246 (diff)
downloadmariadb-git-b19ec8848c9463b86d62601dffb67c75e3dfbd70.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'sql/mysql_install_db.cc')
-rw-r--r--sql/mysql_install_db.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysql_install_db.cc b/sql/mysql_install_db.cc
index 04f3789bad4..f712e29b843 100644
--- a/sql/mysql_install_db.cc
+++ b/sql/mysql_install_db.cc
@@ -103,7 +103,7 @@ static struct my_option my_long_options[]=
static my_bool
-get_one_option(const struct my_option *opt, char *, const char *)
+get_one_option(const struct my_option *opt, const char *, const char *)
{
DBUG_ENTER("get_one_option");
switch (opt->id) {