database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-12684 Show what config file a sysvar got a value from

Browse Source 
change get_one_option() prototype to pass the filename and
not to pass the redundant optid.
This commit is contained in:
Sergei Golubchik
2019-09-29 16:30:57 +02:00
parent 927521a2c1
commit f217612fad
44 changed files with 151 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/mysql_upgrade.c
View File

@@ -268,12 +268,12 @@ static void add_one_option_cnf_file(DYNAMIC_STRING *ds,
}
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 *filename __attribute__((unused)))
{
my_bool add_option= TRUE;
switch (optid) {
switch (opt->id) {
case '?':
printf("%s Ver %s Distrib %s, for %s (%s)\n",
@@ -317,7 +317,7 @@ get_one_option(int optid, const struct my_option *opt,
case 'b': /* --basedir */
case 'd': /* --datadir */
fprintf(stderr, "%s: the '--%s' option is always ignored\n",
my_progname, optid == 'b' ? "basedir" : "datadir");
my_progname, opt->id == 'b' ? "basedir" : "datadir");
/* FALLTHROUGH */
case 'k': /* --version-check */