=== Applying patches on top of PostgreSQL commit ID 53a49365052026907afff7613929710d1e7f0da0 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Feb  1 02:03:28 UTC 2025
On branch cf/5330
nothing to commit, working tree clean
=== applying patch ./v39-0001-Add-function-to-log-the-plan-of-the-currently-ru.patch
Applied patch to 'contrib/auto_explain/auto_explain.c' cleanly.
Applied patch to 'doc/src/sgml/func.sgml' cleanly.
Applied patch to 'src/backend/access/transam/xact.c' cleanly.
Applied patch to 'src/backend/catalog/system_functions.sql' cleanly.
Applied patch to 'src/backend/commands/explain.c' cleanly.
Applied patch to 'src/backend/executor/execMain.c' with conflicts.
Applied patch to 'src/backend/storage/ipc/procsignal.c' cleanly.
Applied patch to 'src/backend/tcop/postgres.c' cleanly.
Applied patch to 'src/backend/utils/init/globals.c' cleanly.
Applied patch to 'src/include/catalog/pg_proc.dat' cleanly.
Applied patch to 'src/include/commands/explain.h' cleanly.
Applied patch to 'src/include/miscadmin.h' cleanly.
Applied patch to 'src/include/nodes/execnodes.h' cleanly.
Applied patch to 'src/include/storage/procsignal.h' cleanly.
Applied patch to 'src/include/tcop/pquery.h' cleanly.
Applied patch to 'src/test/regress/expected/misc_functions.out' cleanly.
Applied patch to 'src/test/regress/sql/misc_functions.sql' cleanly.
U src/backend/executor/execMain.c
diff --cc src/backend/executor/execMain.c
index 604cb0625b,f502a37bd7..0000000000
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@@ -293,12 -294,24 +294,27 @@@ standard_ExecutorStart(QueryDesc *query
   */
  void
  ExecutorRun(QueryDesc *queryDesc,
 -			ScanDirection direction, uint64 count,
 -			bool execute_once)
 +			ScanDirection direction, uint64 count)
  {
+ 	/*
+ 	 * Update ActiveQueryDesc here to enable retrieval of the currently
+ 	 * running queryDesc for nested queries.
+ 	 */
+ 	QueryDesc  *save_ActiveQueryDesc;
+ 
+ 	save_ActiveQueryDesc = ActiveQueryDesc;
+ 	ActiveQueryDesc = queryDesc;
+ 
  	if (ExecutorRun_hook)
 -		(*ExecutorRun_hook) (queryDesc, direction, count, execute_once);
 +		(*ExecutorRun_hook) (queryDesc, direction, count);
  	else
++<<<<<<< ours
 +		standard_ExecutorRun(queryDesc, direction, count);
++=======
+ 		standard_ExecutorRun(queryDesc, direction, count, execute_once);
+ 
+ 	ActiveQueryDesc = save_ActiveQueryDesc;
++>>>>>>> theirs
  }
  
  void