summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Conway2011-06-25 22:58:07 +0000
committerJoe Conway2011-06-25 22:58:07 +0000
commit8af3596d6bb6cfffb57161a62aa2f7f56d5ea3eb (patch)
treed5ade101d7276ad32aa69378964ba92350813991
parenteb03cff8208aa959aabb91aaac0e21fc88966409 (diff)
Async dblink functions require a named connection, and therefore should
use DBLINK_GET_NAMED_CONN rather than DBLINK_GET_CONN. Problem found by Peter Eisentraut and patch by Fujii Masao.
-rw-r--r--contrib/dblink/dblink.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index 19b98fb73d..b8d0342085 100644
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -613,16 +613,13 @@ Datum
dblink_send_query(PG_FUNCTION_ARGS)
{
PGconn *conn = NULL;
- char *connstr = NULL;
char *sql = NULL;
remoteConn *rconn = NULL;
- char *msg;
- bool freeconn = false;
int retval;
if (PG_NARGS() == 2)
{
- DBLINK_GET_CONN;
+ DBLINK_GET_NAMED_CONN;
sql = text_to_cstring(PG_GETARG_TEXT_PP(1));
}
else
@@ -711,13 +708,13 @@ dblink_record_internal(FunctionCallInfo fcinfo, bool is_async)
if (PG_NARGS() == 2)
{
/* text,bool */
- DBLINK_GET_CONN;
+ DBLINK_GET_NAMED_CONN;
fail = PG_GETARG_BOOL(1);
}
else if (PG_NARGS() == 1)
{
/* text */
- DBLINK_GET_CONN;
+ DBLINK_GET_NAMED_CONN;
}
else
/* shouldn't happen */