diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-11-25 00:57:34 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-11-25 00:57:34 +0200 |
| commit | 1a6373e8e2f0c8c5ca6b8ef5076dcb2948eeb41a (patch) | |
| tree | ff2e875015b39ca3c66eba19d145dd014d4e768e /cmd-line-utils/readline/complete.c | |
| parent | b16c389248d03f0c3de549884f607f3f191827b4 (diff) | |
| parent | 5e100a64b51aa2dd09a9a1679413fa03797a95a2 (diff) | |
| download | mariadb-git-1a6373e8e2f0c8c5ca6b8ef5076dcb2948eeb41a.tar.gz | |
Merge with MySQL 5.1.53
Open issues:
- A better fix for #57688; Igor is working on this
- Test failure in index_merge_innodb.test ; Igor promised to look at this
- Some Innodb tests fails (need to merge with latest xtradb) ; Kristian promised to look at this.
- Failing tests: innodb_plugin.innodb_bug56143 innodb_plugin.innodb_bug56632 innodb_plugin.innodb_bug56680 innodb_plugin.innodb_bug57255
- Werror is disabled; Should be enabled after merge with xtradb.
Diffstat (limited to 'cmd-line-utils/readline/complete.c')
| -rw-r--r-- | cmd-line-utils/readline/complete.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cmd-line-utils/readline/complete.c b/cmd-line-utils/readline/complete.c index 2745e4e4801..d11ea2493a6 100644 --- a/cmd-line-utils/readline/complete.c +++ b/cmd-line-utils/readline/complete.c @@ -1839,8 +1839,11 @@ rl_username_completion_function (text, state) #else /* !__WIN32__ && !__OPENNT) */ static char *username = (char *)NULL; static struct passwd *entry; - static int namelen, first_char, first_char_loc; + static int first_char, first_char_loc; char *value; +#if defined (HAVE_GETPWENT) + static int namelen; +#endif if (state == 0) { @@ -1850,7 +1853,9 @@ rl_username_completion_function (text, state) first_char_loc = first_char == '~'; username = savestring (&text[first_char_loc]); +#if defined (HAVE_GETPWENT) namelen = strlen (username); +#endif setpwent (); } |