Merge branch 'master' of https://github.com/postgrespro/postgres_cluster

knizhnik · knizhnik · commit 5bc94486607f · 2016-10-14T19:06:22.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -3806,7 +3806,7 @@ static char * MtmGucSerialize(void)
 		appendStringInfoString(serialized_gucs, " TO ");
 
 		/* quite a crutch */
-		if (strcmp(cur_entry->key, "work_mem") == 0)
+		if (strstr(cur_entry->key, "_mem") != NULL)
 		{
 			appendStringInfoString(serialized_gucs, "'");
 			appendStringInfoString(serialized_gucs, cur_entry->value);
@@ -3955,6 +3955,7 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 		  }
 
 		case T_CreateDomainStmt:
+			/* Detect temp tables access */
 			{
 				CreateDomainStmt *stmt = (CreateDomainStmt *) parsetree;
 				HeapTuple	typeTup;

Original file line number	Diff line number	Diff line change
`@@ -3806,7 +3806,7 @@ static char * MtmGucSerialize(void)`
`3806`	`3806`	`appendStringInfoString(serialized_gucs, " TO ");`
`3807`	`3807`
`3808`	`3808`	`/* quite a crutch */`
`3809`		`- if (strcmp(cur_entry->key, "work_mem") == 0)`
	`3809`	`+ if (strstr(cur_entry->key, "_mem") != NULL)`
`3810`	`3810`	`{`
`3811`	`3811`	`appendStringInfoString(serialized_gucs, "'");`
`3812`	`3812`	`appendStringInfoString(serialized_gucs, cur_entry->value);`
`@@ -3955,6 +3955,7 @@ static void MtmProcessUtility(Node parsetree, const char queryString,`
`3955`	`3955`	`}`
`3956`	`3956`
`3957`	`3957`	`case T_CreateDomainStmt:`
	`3958`	`+ /* Detect temp tables access */`
`3958`	`3959`	`{`
`3959`	`3960`	`CreateDomainStmt stmt = (CreateDomainStmt ) parsetree;`
`3960`	`3961`	`HeapTuple typeTup;`