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

Merge branch '2.2' into 2.2-mrm

Browse Source
This commit is contained in:
Johan Wikman
2017-09-28 15:19:20 +03:00
parent ff467e218a 9c60b68476
commit 89d1f81e37
70 changed files with 748 additions and 705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/gateway.cc
View File

@ -210,7 +210,7 @@ const DEBUG_ARGUMENT debug_arguments[] =
},
{
"redirect-output-to-file", redirect_output_to_file,
"redirect stdout and stderr to the file given as an argument"
"redirect stdout and stderr to the file given as an argument"
},
{NULL, NULL, NULL}
};
@ -2734,7 +2734,7 @@ static int set_user(const char* user)
}
if (prctl(PR_GET_DUMPABLE) == 0)
{
if (prctl(PR_SET_DUMPABLE , 1) == -1)
if (prctl(PR_SET_DUMPABLE, 1) == -1)
{
printf("Error: Failed to set dumpable flag on for the process '%s': %d %s\n",
pwname->pw_name, errno, mxs_strerror(errno));