Forget previous SET ROLE commands while processing RESET SESSION AUTHORIZATION

since that resets the current role

diff --git a/src/backend/pgxc/pool/pgxcnode.c b/src/backend/pgxc/pool/pgxcnode.c
index 486f2d9502929f90a48330e656e09ab2250c6e6e..d121097eb02f72dc5dbb967c134bd8b5cb58e77c 100644 (file)
--- a/src/backend/pgxc/pool/pgxcnode.c
+++ b/src/backend/pgxc/pool/pgxcnode.c
@@ -2722,6 +2722,18 @@ PGXCNodeSetParam(bool local, const char *name, const char *value)
 
                param_list = lappend(param_list, entry);
        }
+
+       /*
+        * Special case for 
+        *      RESET SESSION AUTHORIZATION 
+        *      SET SESSION AUTHORIZATION TO DEFAULT
+        *
+        * We must also forget any SET ROLE commands since RESET SESSION
+        * AUTHORIZATION also resets current role to session default
+        */
+       if ((strcmp(name, "session_authorization") == 0) && (value == NULL))
+               param_list = paramlist_delete_param(param_list, "role");
+
        if (local)
                local_param_list = param_list;
        else