diff options
| author | Staale Smedseng <staale.smedseng@sun.com> | 2009-06-29 15:17:01 +0200 |
|---|---|---|
| committer | Staale Smedseng <staale.smedseng@sun.com> | 2009-06-29 15:17:01 +0200 |
| commit | 67771508836edda4bad393f1a00d89cd419e3814 (patch) | |
| tree | c3d2d1b1efe2de7e702c3d65d8b7bddccbdbd5d0 /server-tools | |
| parent | 729648c4b776ec4992f6333f0c70b4b749e8d996 (diff) | |
| download | mariadb-git-67771508836edda4bad393f1a00d89cd419e3814.tar.gz | |
Merge from 5.0-bt
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/user_map.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server-tools/instance-manager/user_map.cc b/server-tools/instance-manager/user_map.cc index 7871cad7814..cdd7ebcf04b 100644 --- a/server-tools/instance-manager/user_map.cc +++ b/server-tools/instance-manager/user_map.cc @@ -145,8 +145,8 @@ int User_map::load(const char *password_file_name) while (fgets(line, sizeof(line), file)) { /* skip comments and empty lines */ - if (line[0] == '#' || line[0] == '\n' && - (line[1] == '\0' || line[1] == '\r')) + if (line[0] == '#' || (line[0] == '\n' && + (line[1] == '\0' || line[1] == '\r'))) continue; if ((user= new User) == 0) goto done; |