--- sql/oracle/parser3oracle.C	2004/08/03 11:15:27	1.63
+++ sql/oracle/parser3oracle.C	2004/12/23 16:54:52	1.67
@@ -7,20 +7,8 @@
 
 	2001.07.30 using Oracle 8.1.6 [@test tested with Oracle 7.x.x]
 */
-/*
-prob:
-	kgepop: no error frame to pop to for error 21500
-
 
-> I happy to tell you that I have solved the problem.
-
-Excellent news.
-
-> By allocating a separate
-> environment handle for every database handle I share
-*/
-
-static const char *RCSId="$Id: parser3oracle.C,v 1.63 2004/08/03 11:15:27 paf Exp $"; 
+static const char *RCSId="$Id: parser3oracle.C,v 1.67 2004/12/23 16:54:52 paf Exp $"; 
 
 #include "config_includes.h"
 
@@ -125,6 +113,17 @@ static char *lsplit(char **string_ref, c
     return result;
 }
 
+static char* rsplit(char* string, char delim) {
+    if(string) {
+		char* v=strrchr(string, delim); 
+		if(v) {
+			*v=0;
+			return v+1;
+		}
+    }
+    return NULL;	
+}
+
 #ifndef DOXYGEN
 struct Connection {
 	SQL_Driver_services *services;
@@ -287,7 +286,7 @@ public:
 		*connection_ref=&connection;
 
 		char *user=url;
-		char *service=lsplit(user, '@');
+		char *service=rsplit(user, '@');
 		char *pwd=lsplit(user, ':');
 		char *options=lsplit(service, '?');
 
@@ -481,6 +480,9 @@ public:
 			};
 
 			int binds_size=sizeof(Bind_info) * placeholders_count;
+			// we DO store OCIBind* into ATOMIC gc memory, 
+			// but we do not allocate/free it, that's done automatically from oracle [using environment handles]
+			// so we don't have to bother with that
 			Bind_info* binds=static_cast<Bind_info*>(services.malloc_atomic(binds_size));
 			{
 				for(size_t i=0; i<placeholders_count; i++) {
@@ -508,25 +510,24 @@ public:
 						value_length=ph.value? strlen(ph.value): 0;
 					}
 
-					{
-						// clone value for possible output binds
-						// note: even empty input can be replaced by huge output
-						char*& buf=connection.bind_buffers[i]; // get cached buffer
-						if(!buf) // allocate if needed, caching it
-							buf=(char *)services.malloc_atomic(MAX_OUT_STRING_LENGTH+1/*terminator*/);
-						if(value_length)
-							memcpy(buf, ph.value, value_length+1);
-						ph.value=buf;
-					}
+					// clone value for possible output binds
+					// note: even empty input can be replaced by huge output
+					char*& value_buf=connection.bind_buffers[i]; // get cached buffer
+					if(!value_buf) // allocate if needed, caching it
+						value_buf=(char *)services.malloc_atomic(MAX_OUT_STRING_LENGTH+1/*terminator*/);
+					if(value_length)
+						memcpy(value_buf, ph.value, value_length+1);
+					else
+						value_buf[0]=0;
 
-					char placeholder_buf[MAX_STRING];
-					sb4 placeh_len=snprintf(placeholder_buf, sizeof(placeholder_buf), ":%s", ph.name);
+					char name_buf[MAX_STRING];
+					sb4 placeh_len=snprintf(name_buf, sizeof(name_buf), ":%s", ph.name);
 					char check_step_buf[MAX_STRING];
 					snprintf(check_step_buf, sizeof(check_step_buf), "bind by name :%s", ph.name);
 					check(connection, check_step_buf, OCIBindByName(stmthp, 
 						&bi.bind, connection.errhp, 
-						(text*)placeholder_buf, placeh_len,
-						(dvoid *)ph.value, (sword)(MAX_OUT_STRING_LENGTH+1), SQLT_STR, (dvoid *)&bi.indicator, 
+						(text*)name_buf, placeh_len,
+						(dvoid *)value_buf, (sword)(MAX_OUT_STRING_LENGTH+1), SQLT_STR, (dvoid *)&bi.indicator, 
 						(ub2 *)0, (ub2 *)0, (ub4)0, (ub4 *)0, OCI_DEFAULT));
 				}
 
@@ -560,12 +561,11 @@ public:
 
 			{
 				for(size_t i=0; i<placeholders_count; i++) {
-					Placeholder& ph=placeholders[i];
 					Bind_info& bi=binds[i];
-
 					if(bi.indicator==MAGIC_INDICATOR_VALUE_MEANING_NOT_NULL_AND_UNCHANGED/*unchanged*/)
 						continue;
 
+					Placeholder& ph=placeholders[i];
 					if(bi.indicator==-1)
 						ph.is_null=true;
 					else
@@ -577,15 +577,20 @@ public:
 								: "output bind buffer overflow");
 
 					ph.were_updated=true;
-
-					if(cstrClientCharset) {
-						if(ph.value) {
-							size_t value_length;
-							services.transcode(ph.value, strlen(ph.value),
-								ph.value, value_length,
+					const char* bind_buffer=connection.bind_buffers[i];
+					if( size_t value_length=strlen(bind_buffer) ) {
+						char* returned_value=(char*)services.malloc_atomic(value_length+1/*terminator*/);
+						memcpy(returned_value, bind_buffer, value_length+1 );
+						ph.value=returned_value;
+
+						if(cstrClientCharset) {
+							services.transcode(ph.value, value_length,
+								ph.value, value_length/*<this new value is not used afterwards, actually*/,
 								cstrClientCharset,
 								services.request_charset());
 						}
+					} else {
+						ph.value=0;
 					}
 				}
 			}