Merge branch 'tmp_index_fix'

kelvich · kelvich · commit 8652d7c48423 · 2016-04-05T13:03:56.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -2231,9 +2231,10 @@ static void MtmBroadcastUtilityStmt(char const* sql, bool ignoreError)
 			}
 			if (!MtmRunUtilityStmt(conns[i], sql, &utility_errmsg) && !ignoreError)
 			{
-				// errorMsg = "Failed to run command at node %d";
-				// XXX: add check for our node
-				errorMsg = utility_errmsg;
+				if (i + 1 == MtmNodeId)
+					errorMsg = utility_errmsg;
+				else
+					errorMsg = "Failed to run command at node %d";
 
 				failedNode = i;
 				break;
@@ -2438,6 +2439,23 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 				skipCommand = stmt->relation->relpersistence == RELPERSISTENCE_TEMP;
 			}
 			break;
+		case T_IndexStmt:
+			{
+				Oid			relid;
+				Relation	rel;
+				IndexStmt *stmt = (IndexStmt *) parsetree;
+				bool		isTopLevel = (context == PROCESS_UTILITY_TOPLEVEL);
+
+				if (stmt->concurrent)
+					PreventTransactionChain(isTopLevel,
+												"CREATE INDEX CONCURRENTLY");
+
+				relid = RelnameGetRelid(stmt->relation->relname);
+				rel = heap_open(relid, ShareLock);
+				skipCommand = rel->rd_rel->relpersistence == RELPERSISTENCE_TEMP;
+				heap_close(rel, NoLock);
+			}
+			break;
 	    default:
 			skipCommand = false;
 			break;
