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.

2 files changed, 6 insertions, 6 deletions

diff --git a/tests/async_queries.c b/tests/async_queries.c
index a8889fc8d5a..60b58685daa 100644
--- a/tests/async_queries.c
+++ b/tests/async_queries.c
@@ -335,10 +335,10 @@ add_query(const char *q)
 
 
 static my_bool
-handle_option(int optid, const struct my_option *opt __attribute__((unused)),
-              char *arg)
+handle_option(const struct my_option *opt, char *arg,
+              const char *filename __attribute__((unused)))
 {
-  switch (optid)
+  switch (opt->id)
   {
   case '?':
     printf("Usage: async_queries [OPTIONS] query ...\n");
diff --git a/tests/mysql_client_fw.c b/tests/mysql_client_fw.c
index 8a6d38d9e30..cfcb6690f4a 100644
--- a/tests/mysql_client_fw.c
+++ b/tests/mysql_client_fw.c
@@ -1273,10 +1273,10 @@ static struct my_tests_st *get_my_tests();  /* To be defined in main .c file */
 static struct my_tests_st *my_testlist= 0;
 
 static my_bool
-get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
-               char *argument)
+get_one_option(const struct my_option *opt, char *argument,
+               const char *filename __attribute__((unused)))
 {
-  switch (optid) {
+  switch (opt->id) {
   case '#':
     DBUG_PUSH(argument ? argument : default_dbug_option);
     break;