summaryrefslogtreecommitdiff
path: root/client/mysql.cc
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 /client/mysql.cc
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 'client/mysql.cc')
-rw-r--r--client/mysql.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index 6402d651038..7df2d5ee42d 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1728,10 +1728,9 @@ static void usage(int version)
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 *)
{
- switch(optid) {
+ switch(opt->id) {
case OPT_CHARSETS_DIR:
strmake_buf(mysql_charsets_dir, argument);
charsets_dir = mysql_charsets_dir;