=== Applying patches on top of PostgreSQL commit ID 80d7f990496b1c7be61d9a00a2635b7d96b96197 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Feb 19 12:44:26 UTC 2025
On branch cf/5274
nothing to commit, working tree clean
=== applying patch ./v11-0001-Introduce-the-ability-to-set-index-visibility-us.patch
Applied patch to 'doc/src/sgml/catalogs.sgml' cleanly.
Applied patch to 'doc/src/sgml/config.sgml' cleanly.
Applied patch to 'doc/src/sgml/ref/alter_index.sgml' cleanly.
Applied patch to 'doc/src/sgml/ref/create_index.sgml' cleanly.
Applied patch to 'src/backend/bootstrap/bootparse.y' cleanly.
Applied patch to 'src/backend/catalog/index.c' cleanly.
Applied patch to 'src/backend/catalog/toasting.c' cleanly.
Applied patch to 'src/backend/commands/indexcmds.c' cleanly.
Applied patch to 'src/backend/commands/tablecmds.c' cleanly.
Applied patch to 'src/backend/optimizer/util/plancat.c' cleanly.
Applied patch to 'src/backend/parser/gram.y' with conflicts.
Applied patch to 'src/backend/parser/parse_utilcmd.c' cleanly.
Applied patch to 'src/backend/utils/adt/ruleutils.c' cleanly.
Applied patch to 'src/backend/utils/cache/relcache.c' cleanly.
Applied patch to 'src/backend/utils/misc/guc_tables.c' cleanly.
Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' cleanly.
Applied patch to 'src/bin/pg_dump/pg_dump.c' cleanly.
Applied patch to 'src/bin/pg_dump/pg_dump.h' cleanly.
Applied patch to 'src/bin/pg_dump/t/002_pg_dump.pl' cleanly.
Applied patch to 'src/bin/psql/describe.c' cleanly.
Applied patch to 'src/bin/psql/tab-complete.in.c' cleanly.
Applied patch to 'src/include/catalog/index.h' cleanly.
Applied patch to 'src/include/catalog/pg_index.h' cleanly.
Applied patch to 'src/include/nodes/parsenodes.h' cleanly.
Applied patch to 'src/include/optimizer/optimizer.h' cleanly.
Applied patch to 'src/include/parser/kwlist.h' with conflicts.
Applied patch to 'src/include/utils/guc_hooks.h' with conflicts.
Applied patch to 'src/test/modules/test_ddl_deparse/Makefile' cleanly.
Falling back to direct application...
Falling back to direct application...
Applied patch to 'src/test/modules/test_ddl_deparse/test_ddl_deparse.c' cleanly.
Applied patch to 'src/test/regress/expected/create_index.out' cleanly.
Applied patch to 'src/test/regress/sql/create_index.sql' cleanly.
U src/backend/parser/gram.y
U src/include/parser/kwlist.h
U src/include/utils/guc_hooks.h
diff --cc src/backend/parser/gram.y
index 7d99c9355c,1f9a79dfd5..0000000000
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@@ -784,7 -785,7 +785,11 @@@ static Node *makeRecursiveViewSelect(ch
  	UNLISTEN UNLOGGED UNTIL UPDATE USER USING
  
  	VACUUM VALID VALIDATE VALIDATOR VALUE_P VALUES VARCHAR VARIADIC VARYING
++<<<<<<< ours
 +	VERBOSE VERSION_P VIEW VIEWS VIRTUAL VOLATILE
++=======
+ 	VERBOSE VERSION_P VIEW VIEWS VISIBLE VOLATILE
++>>>>>>> theirs
  
  	WHEN WHERE WHITESPACE_P WINDOW WITH WITHIN WITHOUT WORK WRAPPER WRITE
  
@@@ -17997,7 -18033,7 +18044,11 @@@ unreserved_keyword
  			| VERSION_P
  			| VIEW
  			| VIEWS
++<<<<<<< ours
 +			| VIRTUAL
++=======
+ 			|	VISIBLE
++>>>>>>> theirs
  			| VOLATILE
  			| WHITESPACE_P
  			| WITHIN
@@@ -18653,7 -18690,7 +18705,11 @@@ bare_label_keyword
  			| VERSION_P
  			| VIEW
  			| VIEWS
++<<<<<<< ours
 +			| VIRTUAL
++=======
+ 			| VISIBLE
++>>>>>>> theirs
  			| VOLATILE
  			| WHEN
  			| WHITESPACE_P
diff --cc src/include/parser/kwlist.h
index 40cf090ce6,a7235736e0..0000000000
--- a/src/include/parser/kwlist.h
+++ b/src/include/parser/kwlist.h
@@@ -491,7 -492,7 +492,11 @@@ PG_KEYWORD("verbose", VERBOSE, TYPE_FUN
  PG_KEYWORD("version", VERSION_P, UNRESERVED_KEYWORD, BARE_LABEL)
  PG_KEYWORD("view", VIEW, UNRESERVED_KEYWORD, BARE_LABEL)
  PG_KEYWORD("views", VIEWS, UNRESERVED_KEYWORD, BARE_LABEL)
++<<<<<<< ours
 +PG_KEYWORD("virtual", VIRTUAL, UNRESERVED_KEYWORD, BARE_LABEL)
++=======
+ PG_KEYWORD("visible", VISIBLE, UNRESERVED_KEYWORD, BARE_LABEL)
++>>>>>>> theirs
  PG_KEYWORD("volatile", VOLATILE, UNRESERVED_KEYWORD, BARE_LABEL)
  PG_KEYWORD("when", WHEN, RESERVED_KEYWORD, BARE_LABEL)
  PG_KEYWORD("where", WHERE, RESERVED_KEYWORD, AS_LABEL)
diff --cc src/include/utils/guc_hooks.h
index 951451a976,909f9b57ed..0000000000
--- a/src/include/utils/guc_hooks.h
+++ b/src/include/utils/guc_hooks.h
@@@ -174,7 -174,6 +174,11 @@@ extern void assign_wal_sync_method(int 
  extern bool check_synchronized_standby_slots(char **newval, void **extra,
  											 GucSource source);
  extern void assign_synchronized_standby_slots(const char *newval, void *extra);
++<<<<<<< ours
 +extern bool check_idle_replication_slot_timeout(int *newval, void **extra,
 +												GucSource source);
++=======
+ extern void assign_use_invisible_index(bool newval, void *extra);
++>>>>>>> theirs
  
  #endif							/* GUC_HOOKS_H */