From 5398ea0f67c161e908a1f2706c353525b0da22a5 Mon Sep 17 00:00:00 2001
From: openGaussDev <yanghao37@huawei.com>
Date: Wed, 9 Mar 2022 16:33:53 +0800
Subject: [PATCH] fix problem in regression bypass_pbe test

---
 src/test/regress/expected/gs_db_privilege.out |   2 +-
 .../jdbc_test/bypass_pbe/BypassPbe.class      | Bin 7178 -> 7508 bytes
 src/test/regress/parallel_schedule0           |   2 +-
 src/test/regress/sql/gs_db_privilege.sql      |   2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/regress/expected/gs_db_privilege.out b/src/test/regress/expected/gs_db_privilege.out
index bcf46bbec..ca1f81082 100644
--- a/src/test/regress/expected/gs_db_privilege.out
+++ b/src/test/regress/expected/gs_db_privilege.out
@@ -242,7 +242,7 @@ DETAIL:  Permission denied to revoke update any table.
 --function has_any_privilege
 RESET ROLE;
 GRANT UPDATE ANY TABLE TO db_priv_user1 WITH ADMIN OPTION;
-SELECT * FROM gs_db_privileges ORDER BY rolename;
+SELECT * FROM gs_db_privileges ORDER BY rolename, admin_option;
    rolename    |  privilege_type  | admin_option 
 ---------------+------------------+--------------
  db_priv_user1 | delete any table | no
diff --git a/src/test/regress/jdbc_test/bypass_pbe/BypassPbe.class b/src/test/regress/jdbc_test/bypass_pbe/BypassPbe.class
index fcd961a0ced1a38e2a4177c42f13098a7ada706f..6ec99403eb043a8ffc72b8cd4e7ab56a1fbd593c 100644
GIT binary patch
delta 3921
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
I5e19>3;DV&B>(^b

delta 3429
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

diff --git a/src/test/regress/parallel_schedule0 b/src/test/regress/parallel_schedule0
index d333c6b34..a8ece0061 100644
--- a/src/test/regress/parallel_schedule0
+++ b/src/test/regress/parallel_schedule0
@@ -836,7 +836,7 @@ test: pg_compatibility
 # autonomous transaction Test
 
 #test jdbc pbe for bypass
-#test: bypass_pbe
+test: bypass_pbe
 #test: partition for hash list
 test: pbe_hash_list_partition 
 test: hw_partition_list_insert
diff --git a/src/test/regress/sql/gs_db_privilege.sql b/src/test/regress/sql/gs_db_privilege.sql
index 83ce71e84..aa5c925f1 100644
--- a/src/test/regress/sql/gs_db_privilege.sql
+++ b/src/test/regress/sql/gs_db_privilege.sql
@@ -136,7 +136,7 @@ REVOKE UPDATE ANY TABLE FROM db_priv_user1,db_priv_user2,db_priv_user3,db_priv_u
 --function has_any_privilege
 RESET ROLE;
 GRANT UPDATE ANY TABLE TO db_priv_user1 WITH ADMIN OPTION;
-SELECT * FROM gs_db_privileges ORDER BY rolename;
+SELECT * FROM gs_db_privileges ORDER BY rolename, admin_option;
 
 SELECT has_any_privilege('db_priv_user','SELECT ANY TABLE'); --error
 SELECT has_any_privilege('db_priv_user1','SELECT ANY   TABLE'); --error