@@ -229,12 +229,14 @@ static int MtmGcPeriod;
229229static bool MtmIgnoreTablesWithoutPk ;
230230static int MtmLockCount ;
231231
232+ static ExecutorStart_hook_type PreviousExecutorStartHook ;
232233static ExecutorFinish_hook_type PreviousExecutorFinishHook ;
233234static ProcessUtility_hook_type PreviousProcessUtilityHook ;
234235static shmem_startup_hook_type PreviousShmemStartupHook ;
235236
236237static nodemask_t lastKnownMatrix [MAX_NODES ];
237238
239+ static void MtmExecutorStart (QueryDesc * queryDesc ,int eflags );
238240static void MtmExecutorFinish (QueryDesc * queryDesc );
239241static void MtmProcessUtility (Node * parsetree ,const char * queryString ,
240242ProcessUtilityContext context ,ParamListInfo params ,
@@ -2675,6 +2677,9 @@ _PG_init(void)
26752677PreviousShmemStartupHook = shmem_startup_hook ;
26762678shmem_startup_hook = MtmShmemStartup ;
26772679
2680+ PreviousExecutorStartHook = ExecutorStart_hook ;
2681+ ExecutorStart_hook = MtmExecutorStart ;
2682+
26782683PreviousExecutorFinishHook = ExecutorFinish_hook ;
26792684ExecutorFinish_hook = MtmExecutorFinish ;
26802685
@@ -3973,12 +3978,34 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
39733978MtmTx .snapshot = INVALID_CSN ;
39743979}
39753980
3976- if (executed && ! skipCommand )
3981+ if (executed )
39773982{
39783983MtmFinishDDLCommand ();
39793984}
39803985}
39813986
3987+ static void
3988+ MtmExecutorStart (QueryDesc * queryDesc ,int eflags )
3989+ {
3990+ bool ddl_generating_call = false;
3991+ ListCell * tlist ;
3992+
3993+ foreach (tlist ,queryDesc -> plannedstmt -> planTree -> targetlist )
3994+ {
3995+ TargetEntry * tle = (TargetEntry * )lfirst (tlist );
3996+
3997+ if (tle -> resname && strcmp (tle -> resname ,"lo_create" )== 0 )
3998+ ddl_generating_call = true;
3999+ }
4000+
4001+ if (ddl_generating_call )
4002+ MtmProcessDDLCommand (ActivePortal -> sourceText , true);
4003+
4004+ if (PreviousExecutorStartHook != NULL )
4005+ PreviousExecutorStartHook (queryDesc ,eflags );
4006+ else
4007+ standard_ExecutorStart (queryDesc ,eflags );
4008+ }
39824009
39834010static void
39844011MtmExecutorFinish (QueryDesc * queryDesc )