external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 94f22da279 into 7faf4657b7

pull/1334/merge
Svyatoslav 2017-04-21 14:50:12 +00:00 committed by GitHub
parent 7faf4657b7 94f22da279
commit b2ea8217b5
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/backend/distributed/master/master_citus_tools.c
View File

@ -435,6 +435,14 @@ static void
StoreErrorMessage(PGconn *connection, StringInfo queryResultString) StoreErrorMessage(PGconn *connection, StringInfo queryResultString)
{ {
char *errorMessage = PQerrorMessage(connection); char *errorMessage = PQerrorMessage(connection);
/* put a default error message if no error message is reported */
if (errorMessage == NULL)
{
errorMessage = "An error occurred while running the query";
}
else
{
char *firstNewlineIndex = strchr(errorMessage, '\n'); char *firstNewlineIndex = strchr(errorMessage, '\n');
/* trim the error message at the line break */ /* trim the error message at the line break */
@ -442,11 +450,6 @@ StoreErrorMessage(PGconn *connection, StringInfo queryResultString)
{ {
*firstNewlineIndex = '\0'; *firstNewlineIndex = '\0';
} }
/* put a default error message if no error message is reported */
if (errorMessage == NULL)
{
errorMessage = "An error occurred while running the query";
} }
appendStringInfo(queryResultString, "%s", errorMessage); appendStringInfo(queryResultString, "%s", errorMessage);