!1577 修复bypass_pbe用例失败问题

Merge pull request !1577 from 杨皓/master

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

src/test/regress/parallel_schedule0

@@ -837,7 +837,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

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