diff options
| author | Shigeru Hanada | 2011-07-07 00:53:49 +0000 |
|---|---|---|
| committer | Shigeru Hanada | 2011-07-07 00:53:49 +0000 |
| commit | bd1ba36154b168f1324261d63feadbcf92223371 (patch) | |
| tree | 8800e8330c031a15696e0d59515e28a54a91e30c /contrib/dblink/dblink.c | |
| parent | 839776a2f9dd8bd5348f19a848e7d62fdce0682f (diff) | |
| parent | c895e775a57072b075b230d60381ac432520b1a8 (diff) | |
Merge branch 'master' into postgresql_fdwpostgresql_fdw
Diffstat (limited to 'contrib/dblink/dblink.c')
| -rw-r--r-- | contrib/dblink/dblink.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index 19b98fb73d..76617e3f36 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -63,6 +63,7 @@ #include "utils/hsearch.h" #include "utils/lsyscache.h" #include "utils/memutils.h" +#include "utils/rel.h" #include "utils/syscache.h" #include "utils/tqual.h" @@ -613,16 +614,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 +709,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 */ |