--- sql/mysql/parser3mysql.C	2008/06/26 14:30:48	1.33
+++ sql/mysql/parser3mysql.C	2009/04/08 11:13:00	1.35
@@ -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.33 2008/06/26 14:30:48 misha Exp $"; 
+static const char *RCSId="$Id: parser3mysql.C,v 1.35 2009/04/08 11:13:00 misha Exp $"; 
 
 #include "config_includes.h"
 
@@ -28,10 +28,20 @@ static const char *RCSId="$Id: parser3my
 #	define strcasecmp _stricmp
 #endif
 
-static char *lsplit(char *string, char delim) {
+// for mysql < 4.1 
+#ifndef CLIENT_MULTI_RESULTS
+#define	CLIENT_MULTI_RESULTS (1UL << 17)
+#define OLD_MYSQL_CLIENT 1
+#endif
+#ifndef CLIENT_MULTI_STATEMENTS
+#define	CLIENT_MULTI_STATEMENTS (1UL << 16)
+#undef OLD_MYSQL_CLIENT
+#define OLD_MYSQL_CLIENT 1
+#endif
+
+static char *lsplit(char *string, char delim){
 	if(string) {
-		char *v=strchr(string, delim);
-		if(v) {
+		if(char *v=strchr(string, delim)){
 			*v=0;
 			return v+1;
 		}
@@ -39,17 +49,16 @@ static char *lsplit(char *string, char d
 	return 0;
 }
 
-static char *lsplit(char **string_ref, char delim) {
+static char *lsplit(char **string_ref, char delim){
 	char *result=*string_ref;
 	char *next=lsplit(*string_ref, delim);
 	*string_ref=next;
 	return result;
 }
 
-static char* rsplit(char* string, char delim) {
-	if(string) {
-		char* v=strrchr(string, delim); 
-		if(v) {
+static char* rsplit(char* string, char delim){
+	if(string){
+		if(char* v=strrchr(string, delim)){
 			*v=0;
 			return v+1;
 		}
@@ -57,7 +66,7 @@ static char* rsplit(char* string, char d
 	return NULL;	
 }
 
-static void toupper_str(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++);
 }
@@ -68,7 +77,6 @@ struct Connection {
 	MYSQL* handle;
 	const char* client_charset;
 	bool autocommit;
-	bool multi_statements;
 };
 
  
@@ -80,10 +88,12 @@ public:
 
 	MySQL_Driver() : SQL_Driver() {}
 
+#ifndef FREEBSD4
 	~MySQL_Driver() {
 		if(mysql_server_end)
 			mysql_server_end();
 	}
+#endif
 
 	/// get api version
 	int api_version() { return SQL_DRIVER_API_VERSION; }
@@ -103,7 +113,8 @@ public:
 				compress=0&
 				named_pipe=1&
 				autocommit=1&
-				multi_statements=0	// allow more then one statement in one query
+				multi_statements=0	// allows more then one statement in one query
+				old_client=1		// simulates 3.xx client. not compatible with multi_statements option
 			3.x, 4.0 
 				only option for charset is cp1251_koi8.
 			4.1+ accept not 'cp1251_koi8' but 'cp1251', 'utf8' and much more
@@ -133,13 +144,18 @@ public:
 
 		char *charset=0;
 
+#ifdef OLD_MYSQL_CLIENT
+		int client_flag=0;
+#else
+		int client_flag=CLIENT_MULTI_RESULTS;
+#endif
+
 		Connection& connection=*(Connection *)services.malloc(sizeof(Connection));
 		*connection_ref=&connection;
 		connection.services=&services;
 		connection.handle=mysql_init(NULL);
 		connection.client_charset=0;	
 		connection.autocommit=true;
-		connection.multi_statements=false;
 
 		while(options){
 			if(char *key=lsplit(&options, '&')){
@@ -162,12 +178,27 @@ public:
 							if(atoi(value))
 								if(mysql_options(connection.handle, MYSQL_OPT_NAMED_PIPE, 0)!=0)
 									services._throw(mysql_error(connection.handle));
-						} else if(strcasecmp(key, "multi_statements")==0) {
-							if(atoi(value)!=0)
-								connection.multi_statements=true;
 						} else if(strcasecmp(key, "autocommit")==0){
 							if(atoi(value)==0)
 								connection.autocommit=false;
+						} else if(strcasecmp(key, "multi_statements")==0){
+#ifdef OLD_MYSQL_CLIENT
+							services._throw("driver was built with old mysql includes so multi_statements option can't be used");
+#else
+							if(!(client_flag==CLIENT_MULTI_RESULTS || client_flag==CLIENT_MULTI_STATEMENTS))
+								services._throw("you can't specify together options old_client and multi_statements");
+							if(atoi(value)!=0)
+								client_flag=CLIENT_MULTI_STATEMENTS;
+#endif
+						} else if(strcasecmp(key, "old_client")==0){
+#ifdef OLD_MYSQL_CLIENT
+							services._throw("driver was built with old mysql includes so old_client option can't be used");
+#else
+							if(!(client_flag==CLIENT_MULTI_RESULTS || client_flag==0))
+								services._throw("you can't specify together options old_client and multi_statements");
+							if(atoi(value)!=0)
+								client_flag=0;
+#endif
 						} else
 							services._throw("unknown connect option" /*key*/);
 					} else 
@@ -181,7 +212,7 @@ public:
 					host, user, pwd, db,
 					port?port:MYSQL_PORT,
 					unix_socket,
-					(connection.multi_statements) ? CLIENT_MULTI_STATEMENTS : CLIENT_MULTI_RESULTS
+					client_flag
 				)
 		){
 			services._throw(mysql_error(connection.handle));