--- sql/mysql/parser3mysql.C	2004/03/26 13:24:26	1.20
+++ sql/mysql/parser3mysql.C	2004/05/25 07:07:07	1.23
@@ -10,7 +10,7 @@
 	2001.11.06 numrows on "HP-UX istok1 B.11.00 A 9000/869 448594332 two-user license"
 		3.23.42 & 4.0.0.alfa never worked, both subst & .sl version returned 0
 */
-static const char *RCSId="$Id: parser3mysql.C,v 1.20 2004/03/26 13:24:26 paf Exp $"; 
+static const char *RCSId="$Id: parser3mysql.C,v 1.23 2004/05/25 07:07:07 paf Exp $"; 
 
 #include "config_includes.h"
 
@@ -46,7 +46,7 @@ static char *lsplit(char **string_ref, c
     return result;
 }
 
-static void toupper(char *out, const char *in, size_t size) {
+static void toupper_str(char *out, const char *in, size_t size) {
 	while(size--)
 		*out++=(char)toupper(*in++);
 }
@@ -76,7 +76,7 @@ public:
 			dlink(dlopen_file_spec):"client library column is empty";
 	}
 	/**	connect
-		@param used_only_in_connect_url
+		@param url
 			format: @b user:pass@host[:port]|[/unix/socket]/database?
 				charset=cp1251_koi8&
 				timeout=3&
@@ -87,11 +87,11 @@ public:
 			WARNING: must be used only to connect, for buffer doesn't live long
 	*/
 	void connect(
-		char *used_only_in_connect_url, 
+		char *url, 
 		SQL_Driver_services& services, 
 		void **connection_ref ///< output: Connection*
 		) {
-		char *user=used_only_in_connect_url;
+		char *user=url;
 		char *s=lsplit(user, '@');
 		char *host=0;
 		char *unix_socket=0;
@@ -122,7 +122,7 @@ public:
 				if(*key) {
 					if(char *value=lsplit(key, '=')) {
 						if(strcmp(key, "ClientCharset" ) == 0) {
-							toupper(value, value, strlen(value));
+							toupper_str(value, value, strlen(value));
 							connection.cstrClientCharset=value;
 						} else if(strcasecmp(key, "charset")==0) { // left for backward compatibility, consider using ClientCharset
 							cstrBackwardCompAskServerToTranscode=value;
@@ -183,6 +183,7 @@ public:
 		connection.handle=0;
 	}
 	void commit(void *aconnection) {
+		//_asm int 3;
 		Connection& connection=*static_cast<Connection*>(aconnection);
 
 		if(!connection.autocommit)