diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-09-29 16:30:57 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-10-14 10:29:30 +0200 |
| commit | f217612fade6684c6003aea9a9bfc7ab41685ace (patch) | |
| tree | 65ebc4daa0720dd13034840f716437671160f54d /sql/mysql_upgrade_service.cc | |
| parent | 927521a2c18954f03869e91281b90af79b719166 (diff) | |
| download | mariadb-git-f217612fade6684c6003aea9a9bfc7ab41685ace.tar.gz | |
MDEV-12684 Show what config file a sysvar got a value from
change get_one_option() prototype to pass the filename and
not to pass the redundant optid.
Diffstat (limited to 'sql/mysql_upgrade_service.cc')
| -rw-r--r-- | sql/mysql_upgrade_service.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/mysql_upgrade_service.cc b/sql/mysql_upgrade_service.cc index a9df9eaf13b..b612f31a289 100644 --- a/sql/mysql_upgrade_service.cc +++ b/sql/mysql_upgrade_service.cc @@ -78,12 +78,10 @@ static struct my_option my_long_options[]= static my_bool -get_one_option(int optid, - const struct my_option *opt __attribute__ ((unused)), - char *argument __attribute__ ((unused))) +get_one_option(const struct my_option *opt, char *, const char *) { DBUG_ENTER("get_one_option"); - switch (optid) { + switch (opt->id) { case '?': printf("%s\n", USAGETEXT); my_print_help(my_long_options); |