database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Code Activity

Merge from 5.0-bt

Browse Source
This commit is contained in:
Staale Smedseng
2009-06-29 15:17:01 +02:00
parent 5e0c653f03
commit 19dfaa5824
40 changed files with 254 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server-tools/instance-manager/user_map.cc
View File

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