Commit dc554458 authored by Michael Meskes's avatar Michael Meskes

Reversed my incorrect fix.

parent edcf9c23
...@@ -1422,6 +1422,16 @@ Fri May 16 11:45:50 CEST 2003 ...@@ -1422,6 +1422,16 @@ Fri May 16 11:45:50 CEST 2003
Fri May 16 13:32:10 CEST 2003 Fri May 16 13:32:10 CEST 2003
- Made double variables work again. - Made double variables work again.
Mon May 19 09:22:40 CEST 2003
- Fixed exec sql ifdef command.
Tue May 20 11:47:00 CEST 2003
- Reversed my fix for ifdef. It was the example, not ecpg which was
incorrect.
- Changed DBPATH variable to PG_DBPATH.
- Set ecpg version to 2.12.0. - Set ecpg version to 2.12.0.
- Set ecpg library to 3.4.2. - Set ecpg library to 3.4.2.
- Set pgtypes library to 1.0.0 - Set pgtypes library to 1.0.0
......
/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.4 2003/05/02 14:43:25 meskes Exp $ */ /* $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.5 2003/05/20 11:05:27 meskes Exp $ */
#include "postgres_fe.h" #include "postgres_fe.h"
...@@ -264,8 +264,9 @@ ECPGconnect_informix(int lineno, const char *name, const char *user, const char ...@@ -264,8 +264,9 @@ ECPGconnect_informix(int lineno, const char *name, const char *user, const char
char *informix_name = (char *)name, *envname; char *informix_name = (char *)name, *envname;
/* Informix uses an environment variable DBPATH that overrides /* Informix uses an environment variable DBPATH that overrides
* the connection parameters given here */ * the connection parameters given here.
envname = getenv("DBPATH"); * We do the same with PG_DBPATH as the syntax is different. */
envname = getenv("PG_DBPATH");
if (envname) if (envname)
informix_name = envname; informix_name = envname;
return (ECPGconnect(lineno, informix_name, user, passwd, connection_name, autocommit)); return (ECPGconnect(lineno, informix_name, user, passwd, connection_name, autocommit));
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.108 2003/05/19 07:19:57 meskes Exp $ * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.109 2003/05/20 11:05:27 meskes Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -905,7 +905,7 @@ cppline {space}*#(.*\\{space})+.* ...@@ -905,7 +905,7 @@ cppline {space}*#(.*\\{space})+.*
<xskip>{other} { /* ignore */ } <xskip>{other} { /* ignore */ }
<xcond>{identifier}{space}* { <xcond>{identifier}{space}*';' {
if ( preproc_tos >= MAX_NESTED_IF-1 ) { if ( preproc_tos >= MAX_NESTED_IF-1 ) {
mmerror(PARSE_ERROR, ET_FATAL, "Too many nested 'EXEC SQL IFDEF' conditions"); mmerror(PARSE_ERROR, ET_FATAL, "Too many nested 'EXEC SQL IFDEF' conditions");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment