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/tztime.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/tztime.cc')
| -rw-r--r-- | sql/tztime.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc index c45a6598d69..afbe7639dda 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -2641,8 +2641,7 @@ static struct my_option my_long_options[] = C_MODE_START -static my_bool get_one_option(int optid, const struct my_option *, - char *argument); +static my_bool get_one_option(const struct my_option *, char *, const char *); C_MODE_END static void print_version(void) @@ -2664,9 +2663,9 @@ static void print_usage(void) static my_bool -get_one_option(int optid, const struct my_option *opt, char *argument) +get_one_option(const struct my_option *opt, char *argument, const char *) { - switch(optid) { + switch(opt->id) { case '#': #ifndef DBUG_OFF DBUG_PUSH(argument ? argument : "d:t:S:i:O,/tmp/mysq_tzinfo_to_sql.trace"); |