aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/TODO2
-rw-r--r--src/interfaces/ecpg/lib/execute.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/TODO b/doc/TODO
index 49561e76dec..06c1a1c8394 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -55,7 +55,7 @@ ENHANCEMENTS
URGENT
-* Add OUTER joins, left and right[outer](Thomas, Bruce)
+* -Add OUTER joins, left and right[outer](Tom, Thomas)
* Allow long tuples by chaining or auto-storing outside db (TOAST)(Jan)
* Fix memory leak for expressions[memory](Tom?)
diff --git a/src/interfaces/ecpg/lib/execute.c b/src/interfaces/ecpg/lib/execute.c
index 6335af437e2..de27637ea76 100644
--- a/src/interfaces/ecpg/lib/execute.c
+++ b/src/interfaces/ecpg/lib/execute.c
@@ -377,6 +377,7 @@ ECPGexecute(struct statement * stmt)
char *tobeinserted = NULL;
char *p;
char buff[20];
+ int hostvarl = 0;
/*
* Some special treatment is needed for records since we want
@@ -701,7 +702,7 @@ ECPGexecute(struct statement * stmt)
return false;
strcpy(newcopy, copiedquery);
- if ((p = next_insert(newcopy)) == NULL)
+ if ((p = next_insert(newcopy + hostvarl)) == NULL)
{
/*
@@ -714,6 +715,7 @@ ECPGexecute(struct statement * stmt)
else
{
strcpy(p, tobeinserted);
+ hostvarl = strlen(newcopy);
/*
* The strange thing in the second argument is the rest of the
@@ -993,7 +995,7 @@ ECPGdo(int lineno, const char *connection_name, char *query,...)
*
* Copyright (c) 2000, Christof Petig <christof.petig@wtal.de>
*
- * $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.11 2000/09/26 11:41:43 meskes Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.12 2000/10/02 16:15:53 momjian Exp $
*/
PGconn *ECPG_internal_get_connection(char *name);