*** empty log message ***

src/interfaces/ecpg/ChangeLog

@@ -794,5 +794,10 @@ Thu Jan 27 08:12:05 CET 2000
 Mon Feb 14 10:35:18 CET 2000
 
 	- Synced preproc.y with gram.y.
+
+Tue Feb 15 11:14:07 CET 2000
+
+	- Synced keyword.c.
+	- Synced preproc.y with gram.y.
 	- Set library version to 3.0.10.
 	- Set ecpg version to 2.7.0.

src/interfaces/ecpg/preproc/keywords.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.21 2000/01/26 05:58:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.22 2000/02/15 12:15:54 meskes Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -80,6 +80,7 @@ static ScanKeyword ScanKeywords[] = {
 	{"cycle", CYCLE},
 	{"database", DATABASE},
 	{"day", DAY_P},
+	{"dec", DEC},
 	{"decimal", DECIMAL},
 	{"declare", DECLARE},
 	{"default", DEFAULT},
@@ -212,6 +213,7 @@ static ScanKeyword ScanKeywords[] = {
 	{"sequence", SEQUENCE},
 	{"serial", SERIAL},
 	{"serializable", SERIALIZABLE},
+	{"session_user", SESSION_USER},
 	{"set", SET},
 	{"setof", SETOF},
 	{"share", SHARE},

src/interfaces/ecpg/test/Makefile

 all: stp.so test1 test2 test3 test4 test5 perftest
 
 #LDFLAGS=-g -I /usr/local/pgsql/include -L/usr/local/pgsql/lib -lecpg -lpq -lcrypt
-LDFLAGS=-g -I../include -I/usr/include/postgresql  -L/usr/lib/postgresql -L../lib -lecpg -lpq -lcrypt
-#LDFLAGS=-g -I/usr/include/postgresql -lecpg -lpq -lcrypt
+#LDFLAGS=-g -I../include -I/usr/include/postgresql  -L/usr/lib/postgresql -L../lib -lecpg -lpq -lcrypt
+LDFLAGS=-g -I/usr/include/postgresql -lecpg -lpq -lcrypt
 
 #ECPG=/usr/local/pgsql/bin/ecpg
-ECPG=../preproc/ecpg -I../include
-#ECPG=/usr/bin/ecpg -I/usr/include/postgresql
+#ECPG=../preproc/ecpg -I../include
+ECPG=/usr/bin/ecpg -I/usr/include/postgresql
 
 .SUFFIXES: .pgc .c
 
@@ -22,7 +22,7 @@ perftest: perftest.c
 
 stp.so: stp.c
 	cc -fPIC -I../include -I/usr/include/postgresql -c -o stp.o stp.c
-	cc -shared -Wl,-soname,stp.so -o stp.so stp.o -lpq -lecpg
+	ld -Bdynamic -shared -soname stp.so -o stp.so stp.o -lpq -lecpg
 
 
 clean:

src/interfaces/ecpg/test/stp.pgc

@@ -7,7 +7,7 @@ int my_fun (void)
 	EXEC SQL END DECLARE SECTION;	
 	FILE *dbgs;
 
-	if ((dbgs = fopen("/tmp/log", "w")) != NULL)
+	if ((dbgs = fopen("log", "w")) != NULL)
                 ECPGdebug(1, dbgs);
 
 	EXEC SQL WHENEVER SQLERROR GOTO Error;

src/interfaces/ecpg/test/test5.pgc

@@ -51,6 +51,8 @@ static void ErrorExit (void)
 	
 	sqlprint();
 
+	EXEC SQL ROLLBACK;
+
 	EXEC SQL DROP TABLE tab;
 	EXEC SQL DROP FUNCTION my_fun ();
 	EXEC SQL COMMIT;