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 /extra/mariabackup | |
| 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 'extra/mariabackup')
| -rw-r--r-- | extra/mariabackup/innobackupex.cc | 7 | ||||
| -rw-r--r-- | extra/mariabackup/xbstream.cc | 9 | ||||
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 7 |
3 files changed, 10 insertions, 13 deletions
diff --git a/extra/mariabackup/innobackupex.cc b/extra/mariabackup/innobackupex.cc index 952d1f4ec63..fc5e1eef70b 100644 --- a/extra/mariabackup/innobackupex.cc +++ b/extra/mariabackup/innobackupex.cc @@ -728,11 +728,10 @@ indicates an error.\n"); static my_bool -ibx_get_one_option(int optid, - const struct my_option *opt __attribute__((unused)), - char *argument) +ibx_get_one_option(const struct my_option *opt, + char *argument, const char *) { - switch(optid) { + switch(opt->id) { case '?': usage(); exit(0); diff --git a/extra/mariabackup/xbstream.cc b/extra/mariabackup/xbstream.cc index 1655b69235c..d22437427fa 100644 --- a/extra/mariabackup/xbstream.cc +++ b/extra/mariabackup/xbstream.cc @@ -90,8 +90,8 @@ typedef struct { static int get_options(int *argc, char ***argv); static int mode_create(int argc, char **argv); static int mode_extract(int n_threads, int argc, char **argv); -static my_bool get_one_option(int optid, const struct my_option *opt, - char *argument); +static my_bool get_one_option(const struct my_option *opt, + char *argument, const char *filename); int main(int argc, char **argv) @@ -194,10 +194,9 @@ set_run_mode(run_mode_t mode) 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 *) { - switch (optid) { + switch (opt->id) { case 'c': if (set_run_mode(RUN_MODE_CREATE)) { return TRUE; diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index d4badc15520..7924791f0e9 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -1628,11 +1628,10 @@ check_if_param_set(const char *param) } my_bool -xb_get_one_option(int optid, - const struct my_option *opt __attribute__((unused)), - char *argument) +xb_get_one_option(const struct my_option *opt, + char *argument, const char *) { - switch(optid) { + switch(opt->id) { case 'h': strmake(mysql_real_data_home,argument, FN_REFLEN - 1); mysql_data_home= mysql_real_data_home; |