Fixes merge errors

src/backend/distributed/commands/utility_hook.c

@@ -1914,12 +1914,12 @@ GetMarkObjectDistributedParams(Node *parsetree)
 	if (IsA(parsetree, CreateRoleStmt))
 	{
 		CreateRoleStmt *stmt = castNode(CreateRoleStmt, parsetree);
-		MarkObjectDistributedParams params = {
-			.name = stmt->role,
-			.catalogRelId = AuthIdRelationId,
-			.id = get_role_oid(stmt->role, false)
-		};
-		paramsList = lappend(paramsList, &params);
+		MarkObjectDistributedParams *params = (MarkObjectDistributedParams *) palloc(sizeof(MarkObjectDistributedParams));
+		params->name = stmt->role;
+		params->catalogRelId = AuthIdRelationId;
+		params->id = get_role_oid(stmt->role, false);
+
+		paramsList = lappend(paramsList, params);
 	}
 	else if (IsA(parsetree, DropRoleStmt))
 	{
@@ -1927,12 +1927,12 @@ GetMarkObjectDistributedParams(Node *parsetree)
 		RoleSpec *roleSpec;
 		foreach_ptr(roleSpec, stmt->roles)
 		{
-			MarkObjectDistributedParams params = {
-				.name = roleSpec->rolename,
-				.catalogRelId = AuthIdRelationId,
-				.id = get_role_oid(roleSpec->rolename, false)
-			};
-			paramsList = lappend(paramsList, &params);
+			MarkObjectDistributedParams *params = (MarkObjectDistributedParams *) palloc(sizeof(MarkObjectDistributedParams));
+			params->name = roleSpec->rolename;
+			params->catalogRelId = AuthIdRelationId;
+			params->id = get_role_oid(roleSpec->rolename, false);
+
+			paramsList = lappend(paramsList, params);
 		}
 	}
 	/* Add else if branches for other statement types */

src/test/regress/multi_schedule

@@ -109,7 +109,7 @@ test: undistribute_table
 test: run_command_on_all_nodes
 test: background_task_queue_monitor
 test: other_databases grant_role_from_non_maindb
-test: role_operations_2pc
+test: role_operations_from_non_maindb
 test: citus_internal_access
 
 # Causal clock test

src/test/regress/sql/role_operations_from_non_maindb.sql

@@ -1,5 +1,4 @@
 -- Create a new database
-
 set citus.enable_create_database_propagation to on;
 
 CREATE DATABASE test_db;
@@ -9,7 +8,6 @@ SET citus.superuser TO 'postgres';
 \c test_db
 -- Test CREATE ROLE with various options
 CREATE ROLE test_role1 WITH LOGIN PASSWORD 'password1';
-
 \c test_db - - :worker_1_port
 
 CREATE USER "test_role2-needs\!escape"