--- sql/oracle/parser3oracle.C	2003/12/24 08:39:09	1.45
+++ sql/oracle/parser3oracle.C	2003/12/24 12:47:36	1.48
@@ -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.45 2003/12/24 08:39:09 paf Exp $"; 
+static const char *RCSId="$Id: parser3oracle.C,v 1.48 2003/12/24 12:47:36 paf Exp $"; 
 
 #include "config_includes.h"
 
@@ -122,6 +122,8 @@ struct OracleSQL_connection_struct {
 	OCISvcCtx *svchp;
 	OCISession *usrhp;
 
+	char* fetch_buffers[MAX_COLS];
+
 	struct Options {
 		bool bLowerCaseColumnNames;
 		const char* cstrClientCharset;
@@ -346,6 +348,15 @@ public:
 	}
 	void disconnect(void *connection) {
 	    OracleSQL_connection_struct &cs=*(OracleSQL_connection_struct *)connection;
+
+		// free fetch buffers
+		for(int i=0; i<MAX_COLS; i++) {
+			if(void* fetch_buffer=cs.fetch_buffers[i])
+				::free(fetch_buffer);
+			else
+				break;
+		}			
+
 		// Terminate a user session
 		OCISessionEnd(
 			cs.svchp, cs.errhp, cs.usrhp, (ub4)OCI_DEFAULT);
@@ -727,13 +738,22 @@ private: // private funcs
 					}
 				default:
 					coerce_type=SQLT_STR;
-					ptr=col.str=(char *)services.malloc_atomic(MAX_OUT_STRING_LENGTH+1);
+					char*& buf=cs.fetch_buffers[column_count-1];
+					ptr=buf; // get cached buffer
+					if(!ptr) // allocate if needed, caching it
+						ptr=buf=(char *)::/*see disconnect*/malloc(MAX_OUT_STRING_LENGTH+1/*terminator*/);
+					col.str=(char*)ptr;
 					size=MAX_OUT_STRING_LENGTH;
 					break;
 				}
 				
 				col.type=coerce_type;
 				
+				// http://i/docs/oracle/server.804/a58234/oci_func.htm#449680
+				//   this call implicitly allocates the define handle
+				// http://sunsite.eunnet.net/documentation/oracle.8.0.4/server.804/a58234/basics.htm
+				//   when a statement handle is freed, any bind and define handles associated with it 
+				//   are also freed
 				col.def=0; check(cs, "DefineByPos", OCIDefineByPos(
 					stmthp, &col.def, cs.errhp, 
 					column_count, (ub1 *) ptr, size,