summaryrefslogtreecommitdiff
path: root/unittest/mysys
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2019-09-29 16:30:57 +0200
committerSergei Golubchik <serg@mariadb.org>2019-10-14 10:29:30 +0200
commitf217612fade6684c6003aea9a9bfc7ab41685ace (patch)
tree65ebc4daa0720dd13034840f716437671160f54d /unittest/mysys
parent927521a2c18954f03869e91281b90af79b719166 (diff)
downloadmariadb-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 'unittest/mysys')
-rw-r--r--unittest/mysys/my_getopt-t.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/unittest/mysys/my_getopt-t.c b/unittest/mysys/my_getopt-t.c
index 181b5a6ec12..fb0922b88f8 100644
--- a/unittest/mysys/my_getopt-t.c
+++ b/unittest/mysys/my_getopt-t.c
@@ -60,9 +60,9 @@ static struct my_option mopts_options[]=
{ 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
};
-my_bool dummy_get_one_option(int optid __attribute__((unused)),
- const struct my_option *opt __attribute__((unused)),
- char *argument __attribute__((unused)))
+my_bool dummy_get_one_option(const struct my_option *opt __attribute__((unused)),
+ char *argument __attribute__((unused)),
+ const char *filename __attribute__((unused)))
{
return FALSE;
}
@@ -234,9 +234,9 @@ static struct my_option auto_options[]=
-my_bool auto_get_one_option(int optid __attribute__((unused)),
- const struct my_option *opt,
- char *argument)
+my_bool auto_get_one_option(const struct my_option *opt,
+ char *argument,
+ const char *filename __attribute__((unused)))
{
if (argument == autoset_my_option)
{