=== Applying patches on top of PostgreSQL commit ID cb45dc3afb05ce5e5267b1a9be4725d0be7ee33c ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Feb 22 23:06:21 UTC 2025
On branch cf/5589
nothing to commit, working tree clean
=== applying patch ./v1-0001-Avoid-race-condition-between-GRANT-role-and-DROP-.patch
Applied patch to 'doc/src/sgml/ref/drop_owned.sgml' cleanly.
Applied patch to 'src/backend/commands/user.c' with conflicts.
Applied patch to 'src/test/regress/expected/privileges.out' cleanly.
Applied patch to 'src/test/regress/sql/privileges.sql' cleanly.
U src/backend/commands/user.c
diff --cc src/backend/commands/user.c
index 8ae510c623,0c84886e82..0000000000
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@@ -490,7 -490,8 +490,12 @@@ CreateRole(ParseState *pstate, CreateRo
  	 * Advance command counter so we can see new record; else tests in
  	 * AddRoleMems may fail.
  	 */
++<<<<<<< ours
 +	CommandCounterIncrement();
++=======
+ 	if (addroleto || adminmembers || rolemembers || !superuser())
+ 		CommandCounterIncrement();
++>>>>>>> theirs
  
  	/* Default grant. */
  	InitGrantRoleOptions(&popt);