@@ -1096,6 +1096,11 @@ pgfdw_reject_incomplete_xact_state_change(ConnCacheEntry *entry)
10961096 * Cancel the currently-in-progress query (whose query text we do not have)
10971097 * and ignore the result. Returns true if we successfully cancel the query
10981098 * and discard any pending result, and false if not.
1099+ *
1100+ * It's not a huge problem if we throw an ERROR here, but if we get into error
1101+ * recursion trouble, we'll end up slamming the connection shut, which will
1102+ * necessitate failing the entire toplevel transaction even if subtransactions
1103+ * were used. Try to use WARNING where we can.
10991104 */
11001105static bool
11011106pgfdw_cancel_query (PGconn * conn )
@@ -1143,6 +1148,11 @@ pgfdw_cancel_query(PGconn *conn)
11431148 * If the query is executed successfully but returns an error, the return
11441149 * value is true if and only if ignore_errors is set. If the query can't be
11451150 * sent or times out, the return value is false.
1151+ *
1152+ * It's not a huge problem if we throw an ERROR here, but if we get into error
1153+ * recursion trouble, we'll end up slamming the connection shut, which will
1154+ * necessitate failing the entire toplevel transaction even if subtransactions
1155+ * were used. Try to use WARNING where we can.
11461156 */
11471157static bool
11481158pgfdw_exec_cleanup_query (PGconn * conn ,const char * query ,bool ignore_errors )
@@ -1189,11 +1199,6 @@ pgfdw_exec_cleanup_query(PGconn *conn, const char *query, bool ignore_errors)
11891199 * be a query that was initiated as part of transaction abort to get the remote
11901200 * side back to the appropriate state.
11911201 *
1192- * It's not a huge problem if we throw an ERROR here, but if we get into error
1193- * recursion trouble, we'll end up slamming the connection shut, which will
1194- * necessitate failing the entire toplevel transaction even if subtransactions
1195- * were used. Try to use WARNING where we can.
1196- *
11971202 * endtime is the time at which we should give up and assume the remote
11981203 * side is dead. Returns true if the timeout expired, otherwise false.
11991204 * Sets *result except in case of a timeout.
