1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00

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
This commit is contained in:
Marc Alff
2010-09-01 19:13:24 -06:00
parent b04e28c8c7
commit 7e8d74505e

View File

@@ -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;