diff options
| author | Marc Alff <marc.alff@oracle.com> | 2010-09-01 19:13:24 -0600 |
|---|---|---|
| committer | Marc Alff <marc.alff@oracle.com> | 2010-09-01 19:13:24 -0600 |
| commit | 7e8d74505e2334db76a20360168e650149c99cc5 (patch) | |
| tree | 167a4b4e6fc2997917d92266aa1dea784262c4af /mysys/my_getopt.c | |
| parent | b04e28c8c76cc1680bdf75e265283a148077d090 (diff) | |
| download | mariadb-git-7e8d74505e2334db76a20360168e650149c99cc5.tar.gz | |
Bug#55873 short startup options do not work in 5.5
Merge cleanup, fixed a build warning:
my_getopt.c:156: warning: 'opt_found' may be used uninitialized in this function
Diffstat (limited to 'mysys/my_getopt.c')
| -rw-r--r-- | mysys/my_getopt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index 4faaadb3f70..bc99bad3794 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -163,7 +163,6 @@ int handle_options(int *argc, char ***argv, int error, i; my_bool is_cmdline_arg= 1; - LINT_INIT(opt_found); /* handle_options() assumes arg0 (program name) always exists */ DBUG_ASSERT(argc && *argc >= 1); DBUG_ASSERT(argv && *argv); @@ -188,6 +187,7 @@ int handle_options(int *argc, char ***argv, { char **first= pos; char *cur_arg= *pos; + opt_found= 0; if (!is_cmdline_arg && (cur_arg == args_separator)) { is_cmdline_arg= 1; |