3434#include "access/xlog.h"
3535#include "access/xlogdefs.h"
3636#include "commands/waitlsn.h"
37-
37+ #include "storage/proc.h"
38+ #include "access/transam.h"
3839
3940/* Latches Own-DisownLatch and AbortCаllBack */
4041static uint32 GetSHMEMSize (void );
@@ -134,9 +135,7 @@ WaitLSNSetLatch(void)
134135{
135136SpinLockAcquire (& state -> l_arr [i ].slock );
136137if (state -> l_arr [i ].pid != 0 )
137- {
138138SetLatch (& state -> l_arr [i ].latch );
139- }
140139SpinLockRelease (& state -> l_arr [i ].slock );
141140}
142141}
@@ -163,7 +162,6 @@ WaitLSNUtility(const char *lsn, const int delay)
163162
164163for (;;)
165164{
166- ResetLatch (& state -> l_arr [MyBackendId ].latch );
167165cur_lsn = GetXLogReplayRecPtr (NULL );
168166
169167/* If LSN had been Replayed */
@@ -183,10 +181,11 @@ WaitLSNUtility(const char *lsn, const int delay)
183181tdelay -= (secs * 1000 + microsecs /1000 );
184182timer = GetCurrentTimestamp ();
185183}
186-
187- /* Tom Lane insists on! Discussion: <1661(dot)1469996911(at)sss(dot)pgh(dot)pa(dot)us> */
188- CHECK_FOR_INTERRUPTS ();
184+ MyPgXact -> xmin = InvalidTransactionId ;
189185WaitLatch (& state -> l_arr [MyBackendId ].latch ,latch_events ,tdelay );
186+ ResetLatch (& state -> l_arr [MyBackendId ].latch );
187+ CHECK_FOR_INTERRUPTS ();
188+
190189}
191190
192191WLDisownLatch ();