diff options
| author | unknown <rburnett@bk-internal.mysql.com> | 2006-05-24 14:57:44 +0200 |
|---|---|---|
| committer | unknown <rburnett@bk-internal.mysql.com> | 2006-05-24 14:57:44 +0200 |
| commit | 2380913da8c9de155e6e8352c648eab68b4f4f8d (patch) | |
| tree | 1d19307b77723acf31147c5356f8c9961968df2c /mysys | |
| parent | bc1784298f3efe11f29710a207ff2b42372e4b0d (diff) | |
| parent | a04d9fa947ec5fc22368c15d7c6c7ba47898405f (diff) | |
| download | mariadb-git-2380913da8c9de155e6e8352c648eab68b4f4f8d.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysys')
| -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 95dc5afeae9..4de2984d9b9 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -486,7 +486,7 @@ invalid value '%s'\n", } get_one_option(optp->id, optp, argument); - (*argc)--; /* option handled (short or long), decrease argument count */ + (*argc)--; /* option handled (short or long), decrease argument count */ } else /* non-option found */ (*argv)[argvpos++]= cur_arg; |