- Fixed Informix compat math functions to cope with the situations

  where one argument takes the result.
- Applied thread patches by Lee Kindness

Author: Michael Meskes

src/interfaces/ecpg/ChangeLog

@@ -1724,9 +1724,9 @@ Wed Dec 17 16:11:16 CET 2003
 	  variable listing for output variables in cursor definitions
 	- Fixed incorrect if call in long=>numeric conversion.
 	- Set ecpg version to 3.1.0
-	- Set ecpg library to 4.1.0
-	- Set pgtypes library to 1.1.0
-	- Set compat library to 1.1.0
+	- Set ecpg library to 4.1
+	- Set pgtypes library to 1.1
+	- Set compat library to 1.1
 
 Mon Jan 26 21:57:14 CET 2004
 
@@ -1759,6 +1759,14 @@ Thu Mar  4 08:29:02 CET 2004
 
 	- Fixed segfault due to missing check for variable declaration.
 	- Added check for multidimensional array usage.
-	- Set pgtypeslib version to 1.2.
+	
+Sun Mar 14 12:59:15 CET 2004
+
+	- Fixed Informix compat math functions to cope with the situations
+	  where one argument takes the result.
+	- Applied thread patches by Lee Kindness
+	- Set pgtypes library version to 1.2.
 	- Set ecpg version to 3.2.0.
+	- Set compat library version to 1.2.
+	- Set ecpg library version to 4.2.
 

src/interfaces/ecpg/compatlib/informix.c

@@ -60,8 +60,7 @@ deccall3(decimal * arg1, decimal * arg2, decimal * result, int (*ptr) (numeric *
 			   *nres;
 	int			i;
 
-	/* set it to null in case it errors out later */
-		rsetnull(CDECIMALTYPE, (char *) result);
+	/* we must NOT set the result to NULL here because it may be the same variable as one of the arguments */
 	if (risnull(CDECIMALTYPE, (char *) arg1) || risnull(CDECIMALTYPE, (char *) arg2))
 		return 0;
 
@@ -100,8 +99,13 @@ deccall3(decimal * arg1, decimal * arg2, decimal * result, int (*ptr) (numeric *
 	i = (*ptr) (a1, a2, nres);
 
 	if (i == 0)					/* No error */
+	{
+		
+		/* set the result to null in case it errors out later */
+		rsetnull(CDECIMALTYPE, (char *) result);
 		PGTYPESnumeric_to_decimal(nres, result);
-
+	}
+	
 	PGTYPESnumeric_free(nres);
 	PGTYPESnumeric_free(a1);
 	PGTYPESnumeric_free(a2);
@@ -268,7 +272,6 @@ decdiv(decimal * n1, decimal * n2, decimal * result)
 
 	int			i;
 
-	rsetnull(CDECIMALTYPE, (char *) result);
 	i = deccall3(n1, n2, result, PGTYPESnumeric_div);
 
 	if (i != 0)
@@ -293,7 +296,6 @@ decmul(decimal * n1, decimal * n2, decimal * result)
 {
 	int			i;
 
-	rsetnull(CDECIMALTYPE, (char *) result);	
 	i = deccall3(n1, n2, result, PGTYPESnumeric_mul);
 
 	if (i != 0)
@@ -315,7 +317,6 @@ decsub(decimal * n1, decimal * n2, decimal * result)
 {
 	int			i;
 
-	rsetnull(CDECIMALTYPE, (char *) result);
 	i = deccall3(n1, n2, result, PGTYPESnumeric_sub);
 
 	if (i != 0)

src/interfaces/ecpg/ecpglib/Makefile

@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.13 2004/02/10 07:26:25 tgl Exp $
+# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.14 2004/03/14 12:16:29 meskes Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.global
 
 NAME= ecpg
 SO_MAJOR_VERSION= 4
-SO_MINOR_VERSION= 1
+SO_MINOR_VERSION= 2
 
 override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir) $(CPPFLAGS) $(THREAD_CPPFLAGS) 
 

src/interfaces/ecpg/ecpglib/connect.c

@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.19 2003/11/29 19:52:08 pgsql Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.20 2004/03/14 12:16:29 meskes Exp $ */
 
 #define POSTGRES_ECPG_INTERNAL
 #include "postgres_fe.h"
@@ -14,17 +14,34 @@
 
 #ifdef ENABLE_THREAD_SAFETY
 static pthread_mutex_t connections_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_key_t  actual_connection_key;
+static pthread_once_t actual_connection_key_once = PTHREAD_ONCE_INIT;
+#else
+static struct connection *actual_connection = NULL;
 #endif
 static struct connection *all_connections = NULL;
-static struct connection *actual_connection = NULL;
+
+#ifdef ENABLE_THREAD_SAFETY
+static void
+ecpg_actual_connection_init(void)
+{
+  pthread_key_create(&actual_connection_key, NULL);
+}
+#endif
 
 static struct connection *
 ecpg_get_connection_nr(const char *connection_name)
 {
 	struct connection *ret = NULL;
 
 	if ((connection_name == NULL) || (strcmp(connection_name, "CURRENT") == 0))
+	{
+#ifdef ENABLE_THREAD_SAFETY
+		ret = pthread_getspecific(actual_connection_key);
+#else
 		ret = actual_connection;
+#endif
+	}
 	else
 	{
 		struct connection *con;
@@ -86,8 +103,13 @@ ecpg_finish(struct connection * act)
 				con->next = act->next;
 		}
 
+#ifdef ENABLE_THREAD_SAFETY
+		if( pthread_getspecific(actual_connection_key) == act )
+		  pthread_setspecific(actual_connection_key, all_connections);
+#else
 		if (actual_connection == act)
 			actual_connection = all_connections;
+#endif
 
 		ECPGlog("ecpg_finish: Connection %s closed.\n", act->name);
 
@@ -150,7 +172,11 @@ ECPGsetconn(int lineno, const char *connection_name)
 	if (!ECPGinit(con, connection_name, lineno))
 		return (false);
 
+#ifdef ENABLE_THREAD_SAFETY
+	pthread_setspecific(actual_connection_key, con);
+#else
 	actual_connection = con;
+#endif
 	return true;
 }
 
@@ -370,7 +396,13 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
 	else
 		this->next = all_connections;
 
-	actual_connection = all_connections = this;
+	all_connections = this;
+#ifdef ENABLE_THREAD_SAFETY
+	pthread_once(&actual_connection_key_once, ecpg_actual_connection_init);
+	pthread_setspecific(actual_connection_key, all_connections);
+#else
+	actual_connection = all_connections;
+#endif
 
 	ECPGlog("ECPGconnect: opening database %s on %s port %s %s%s%s%s\n",
 			realname ? realname : "<DEFAULT>",

src/interfaces/ecpg/ecpglib/misc.c

@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/misc.c,v 1.18 2003/11/29 19:52:08 pgsql Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/misc.c,v 1.19 2004/03/14 12:16:30 meskes Exp $ */
 
 #define POSTGRES_ECPG_INTERNAL
 #include "postgres_fe.h"
@@ -118,10 +118,15 @@ ECPGinit(const struct connection * con, const char *connection_name, const int l
 }
 
 #ifdef ENABLE_THREAD_SAFETY
-static void
-ecpg_sqlca_key_init(void)
+static void *ecpg_sqlca_key_destructor(void *arg)
 {
-	pthread_key_create(&sqlca_key, NULL);
+  if( arg != NULL )
+    free(arg); /* sqlca structure allocated in ECPGget_sqlca */
+}
+
+static void ecpg_sqlca_key_init(void)
+{
+  pthread_key_create(&sqlca_key, ecpg_sqlca_key_destructor);
 }
 #endif
 

src/interfaces/ecpg/test/Makefile

@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.43 2003/12/19 23:29:15 momjian Exp $
+# $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.44 2004/03/14 12:16:30 meskes Exp $
 
 subdir = src/interfaces/ecpg/test
 top_builddir = ../../../..
@@ -10,7 +10,7 @@ ECPG = ../preproc/ecpg -I$(srcdir)/../include
 
 TESTS = test1 test2 test3 test4 perftest dyntest dyntest2 test_notice test_code100 test_init testdynalloc num_test dt_test test_informix
 ifeq ($(enable_thread_safety), yes)
-TESTS += test_thread
+TESTS += test_thread test_thread_implicit
 endif
 
 all: $(TESTS)