summaryrefslogtreecommitdiff
path: root/mysys/my_default.c
diff options
context:
space:
mode:
Diffstat (limited to 'mysys/my_default.c')
-rw-r--r--mysys/my_default.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/my_default.c b/mysys/my_default.c
index 0bd76a1cff0..87258a3b27e 100644
--- a/mysys/my_default.c
+++ b/mysys/my_default.c
@@ -410,14 +410,13 @@ int get_defaults_options(int argc, char **argv,
char **extra_defaults,
char **group_suffix)
{
- int org_argc= argc, prev_argc= 0;
+ int org_argc= argc;
*defaults= *extra_defaults= *group_suffix= 0;
- while (argc >= 2 && argc != prev_argc)
+ while (argc >= 2)
{
/* Skip program name or previously handled argument */
argv++;
- prev_argc= argc; /* To check if we found */
if (!*defaults && is_prefix(*argv,"--defaults-file="))
{
*defaults= *argv + sizeof("--defaults-file=")-1;
@@ -436,6 +435,7 @@ int get_defaults_options(int argc, char **argv,
argc--;
continue;
}
+ break;
}
return org_argc - argc;
}