hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Develop merge

Browse Source 
Develop merge
This commit is contained in:
MassimilianoPinto
2015-09-07 11:13:49 +02:00
parent 197f656104 8cd3971d45
commit 4653830104
30 changed files with 337 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/core/dbusers.c
View File

@ -907,12 +907,13 @@ getAllUsers(SERVICE *service, USERS *users)
users_data = (char *)calloc(nusers, (users_data_row_len * sizeof(char)) + 1);
if (users_data == NULL) {
char errbuf[STRERROR_BUFLEN];
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,
"Error : Memory allocation for user data failed due to "
"Error : Memory allocation for user data failed due to "
"%d, %s.",
errno,
strerror(errno))));
errno,
strerror_r(errno, errbuf, sizeof(errbuf)))));
mysql_free_result(result);
mysql_close(con);
@ -1426,12 +1427,13 @@ getUsers(SERVICE *service, USERS *users)
users_data = (char *)calloc(nusers, (users_data_row_len * sizeof(char)) + 1);
if (users_data == NULL) {
char errbuf[STRERROR_BUFLEN];
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,
"Error : Memory allocation for user data failed due to "
"%d, %s.",
errno,
strerror(errno))));
strerror_r(errno, errbuf, sizeof(errbuf)))));
mysql_free_result(result);
mysql_close(con);
@ -2481,4 +2483,4 @@ bool check_service_permissions(SERVICE* service)
mysql_close(mysql);
free(dpasswd);
return rval;
}
}