summaryrefslogtreecommitdiff
path: root/mysys/my_getopt.c
diff options
context:
space:
mode:
authorjani@rhols221.adsl.netsonic.fi <>2002-05-15 02:33:41 +0300
committerjani@rhols221.adsl.netsonic.fi <>2002-05-15 02:33:41 +0300
commit3893920cbeaa0d510e58ca0963031b5dc69abac8 (patch)
tree8a7bbd8f589ce62a8862060f8672199092fa14b4 /mysys/my_getopt.c
parent9eda54d1538f2c3caf80deaa1e1a43411893263c (diff)
downloadmariadb-git-3893920cbeaa0d510e58ca0963031b5dc69abac8.tar.gz
Some bug fixes.
Diffstat (limited to 'mysys/my_getopt.c')
-rw-r--r--mysys/my_getopt.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c
index d6aebbe4f75..94f0af1ae70 100644
--- a/mysys/my_getopt.c
+++ b/mysys/my_getopt.c
@@ -427,7 +427,8 @@ static int setval (const struct my_option *opts, char *argument,
else if (opts->var_type == GET_STRALC)
{
if ((*((char**) result_pos)))
- my_free((*(char**) result_pos), MYF(MY_ALLOW_ZERO_PTR));
+ my_free((*(char**) result_pos),
+ MYF(MY_WME | MY_FAE | MY_ALLOW_ZERO_PTR));
*((char**) result_pos)= my_strdup(argument, MYF(MY_WME));
}
if (err)
@@ -748,7 +749,10 @@ void my_print_variables(const struct my_option *options)
if (!optp->def_value && !*((ulonglong*) optp->value))
printf("(No default value)\n");
else
- printf("%s\n", longlong2str(*((ulonglong*) optp->value), buff, 10));
+ {
+ longlong2str(*((ulonglong*) optp->value), buff, 10);
+ printf("%s\n", buff);
+ }
}
}
}