--- sql/oracle/parser3oracle.C	2002/10/31 10:00:04	1.21
+++ sql/oracle/parser3oracle.C	2002/12/09 07:56:27	1.24
@@ -7,7 +7,7 @@
 
 	2001.07.30 using Oracle 8.1.6 [@test tested with Oracle 7.x.x]
 */
-static const char *RCSId="$Id: parser3oracle.C,v 1.21 2002/10/31 10:00:04 paf Exp $"; 
+static const char *RCSId="$Id: parser3oracle.C,v 1.24 2002/12/09 07:56:27 paf Exp $"; 
 
 #include "config_includes.h"
 
@@ -68,18 +68,17 @@ static int pa_setenv(const char *name, c
 #else 
 	//#ifdef HAVE_SETENV
 	if(value) {
-		char *buf;
 		if(prev_value) {
 			// MEM_LEAK_HERE
-			buf=(char *)::malloc(strlen(prev_value)
+			char *buf=(char *)::malloc(strlen(prev_value)
 				+strlen(value)
 				+1);
 			strcpy(buf, prev_value);
 			strcat(buf, value);
-		} else
-			buf=value;
+			value=buf;
+		}
 
-		return setenv(name, buf, 1/*overwrite*/); 
+		return setenv(name, value, 1/*overwrite*/); 
 	} else {
 		unsetenv(name);
 		return 0;
@@ -922,14 +921,13 @@ void check(
 
 	const char *prefix="ERROR";
 	switch (status) {
-	case OCI_SUCCESS:
-		return; // hurrah
+	case OCI_SUCCESS: // hurrah
+	case OCI_SUCCESS_WITH_INFO:		// ignoring. example: count(column) when column contains NULLs, 
+														// count() not counting them and gives that status
+		return;
 	case OCI_ERROR:
-	case OCI_SUCCESS_WITH_INFO:
 		{
 		sb4 errcode;
-		if(status==OCI_SUCCESS_WITH_INFO)
-			prefix="WARNING";
 		if(OracleSQL_driver->OCIErrorGet((dvoid *)cs.errhp, (ub4)1, (text *)NULL, &errcode, 
 			(text *)reason, (ub4)sizeof(reason), OCI_HTYPE_ERROR)==OCI_SUCCESS)
 			msg=reason;
@@ -951,8 +949,8 @@ void check(
 		msg="unknown"; break;
 	}
 
-	snprintf(cs.error, sizeof(cs.error), "%s: %s (%s, %d)", 
-		prefix, msg, step, (int)status);
+	snprintf(cs.error, sizeof(cs.error), "%s (%s, %d)", 
+		msg, step, (int)status);
 	longjmp(cs.mark, 1);
 }