diff --git a/src/test/isolation2/input/resgroup/resgroup_bypass.source b/src/test/isolation2/input/resgroup/resgroup_bypass.source
index 47c10f036e9aa217b7e81e094ab385bf6746aff3..77252dec4466055f51f3a87da407af9efd1b35f6 100644
--- a/src/test/isolation2/input/resgroup/resgroup_bypass.source
+++ b/src/test/isolation2/input/resgroup/resgroup_bypass.source
@@ -104,14 +104,14 @@ ALTER RESOURCE GROUP rg_bypass_test SET concurrency 0;
 -- gp_resource_group_bypass is not allowed inside a function
 --
 
-61: DROP FUNCTION IF EXISTS func_resgroup_bypass_test(int);
-61: CREATE FUNCTION func_resgroup_bypass_test(c1 int) RETURNS INT AS $$
-    	SET gp_resource_group_bypass TO ON; -- inside a function
-    	SELECT 1
-    $$ LANGUAGE SQL;
-61: SELECT func_resgroup_bypass_test(1);
-61: DROP FUNCTION func_resgroup_bypass_test(int);
-61q:
+DROP FUNCTION IF EXISTS func_resgroup_bypass_test(int);
+CREATE FUNCTION func_resgroup_bypass_test(c1 int) RETURNS INT AS $$
+	SET gp_resource_group_bypass TO ON; /* inside a function */
+	SELECT 1
+$$ LANGUAGE SQL;
+SELECT func_resgroup_bypass_test(1);
+DROP FUNCTION func_resgroup_bypass_test(int);
+
 
 --
 -- memory limit in bypass mode, on qd
diff --git a/src/test/isolation2/output/resgroup/resgroup_bypass.source b/src/test/isolation2/output/resgroup/resgroup_bypass.source
index 4211297ad074a59d279ce203b86ba76aabfa2d37..8c0cb1eaf0e70340d6b6848553c5a54f55c41725 100644
--- a/src/test/isolation2/output/resgroup/resgroup_bypass.source
+++ b/src/test/isolation2/output/resgroup/resgroup_bypass.source
@@ -126,16 +126,16 @@ ABORT
 -- gp_resource_group_bypass is not allowed inside a function
 --
 
-61: DROP FUNCTION IF EXISTS func_resgroup_bypass_test(int);
+DROP FUNCTION IF EXISTS func_resgroup_bypass_test(int);
 DROP
-61: CREATE FUNCTION func_resgroup_bypass_test(c1 int) RETURNS INT AS $$ SET gp_resource_group_bypass TO ON; -- inside a function SELECT 1 $$ LANGUAGE SQL;
+CREATE FUNCTION func_resgroup_bypass_test(c1 int) RETURNS INT AS $$ SET gp_resource_group_bypass TO ON; /* inside a function */ SELECT 1 $$ LANGUAGE SQL;
 CREATE
-61: SELECT func_resgroup_bypass_test(1);
+SELECT func_resgroup_bypass_test(1);
 ERROR:  SET gp_resource_group_bypass cannot run inside a transaction block
 CONTEXT:  SQL function "func_resgroup_bypass_test" statement 1
-61: DROP FUNCTION func_resgroup_bypass_test(int);
+DROP FUNCTION func_resgroup_bypass_test(int);
 DROP
-61q: ... <quitting>
+
 
 --
 -- memory limit in bypass mode, on qd
diff --git a/src/test/isolation2/output/resgroup/resgroup_bypass_optimizer.source b/src/test/isolation2/output/resgroup/resgroup_bypass_optimizer.source
index f40d37dceb6d5edd71aa94f23cfede5a515e4047..7d3b96ba67f75a8ba9bcd7f52d3f338d6ef07eaa 100644
--- a/src/test/isolation2/output/resgroup/resgroup_bypass_optimizer.source
+++ b/src/test/isolation2/output/resgroup/resgroup_bypass_optimizer.source
@@ -126,16 +126,16 @@ ABORT
 -- gp_resource_group_bypass is not allowed inside a function
 --
 
-61: DROP FUNCTION IF EXISTS func_resgroup_bypass_test(int);
+DROP FUNCTION IF EXISTS func_resgroup_bypass_test(int);
 DROP
-61: CREATE FUNCTION func_resgroup_bypass_test(c1 int) RETURNS INT AS $$ SET gp_resource_group_bypass TO ON; -- inside a function SELECT 1 $$ LANGUAGE SQL;
+CREATE FUNCTION func_resgroup_bypass_test(c1 int) RETURNS INT AS $$ SET gp_resource_group_bypass TO ON; /* inside a function */ SELECT 1 $$ LANGUAGE SQL;
 CREATE
-61: SELECT func_resgroup_bypass_test(1);
+SELECT func_resgroup_bypass_test(1);
 ERROR:  SET gp_resource_group_bypass cannot run inside a transaction block
 CONTEXT:  SQL function "func_resgroup_bypass_test" statement 1
-61: DROP FUNCTION func_resgroup_bypass_test(int);
+DROP FUNCTION func_resgroup_bypass_test(int);
 DROP
-61q: ... <quitting>
+
 
 --
 -- memory limit in bypass mode, on qd