--- sql/mysql/parser3mysql.C	2004/07/28 14:32:05	1.25
+++ sql/mysql/parser3mysql.C	2007/08/27 14:49:34	1.27
@@ -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.25 2004/07/28 14:32:05 paf Exp $"; 
+static const char *RCSId="$Id: parser3mysql.C,v 1.27 2007/08/27 14:49:34 misha Exp $"; 
 
 #include "config_includes.h"
 
@@ -46,6 +46,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;	
+}
+
 static void toupper_str(char *out, const char *in, size_t size) {
 	while(size--)
 		*out++=(char)toupper(*in++);
@@ -92,7 +103,7 @@ public:
 		void **connection_ref ///< output: Connection*
 		) {
 		char *user=url;
-		char *s=lsplit(user, '@');
+		char *s=rsplit(user, '@');
 		char *host=0;
 		char *unix_socket=0;
 		if(s && s[0]=='[') { // unix socket
@@ -155,7 +166,7 @@ public:
 				"'charset' option is obsolete and should not be used with new 'ClientCharset' option");
 
 		if(!mysql_real_connect(connection.handle, 
-			host, user, pwd, db, port?port:MYSQL_PORT, unix_socket, 0))
+			host, user, pwd, db, port?port:MYSQL_PORT, unix_socket, CLIENT_MULTI_STATEMENTS))
 			services._throw(mysql_error(connection.handle));
 
 		if(cstrBackwardCompAskServerToTranscode) {