*** contrib/dblink/dblink.c.org 2009-09-09 13:54:35.000000000 +0900 --- contrib/dblink/dblink.c 2009-09-09 13:59:52.000000000 +0900 *************** *** 855,863 **** (PQresultStatus(res) != PGRES_COMMAND_OK && PQresultStatus(res) != PGRES_TUPLES_OK)) { - dblink_res_error(conname, res, "could not execute query", fail); if (freeconn) PQfinish(conn); MemoryContextSwitchTo(oldcontext); SRF_RETURN_DONE(funcctx); } --- 855,863 ---- (PQresultStatus(res) != PGRES_COMMAND_OK && PQresultStatus(res) != PGRES_TUPLES_OK)) { if (freeconn) PQfinish(conn); + dblink_res_error(conname, res, "could not execute query", fail); MemoryContextSwitchTo(oldcontext); SRF_RETURN_DONE(funcctx); }