--- sql/mysql/parser3mysql.C	2013/03/31 10:31:21	1.45
+++ sql/mysql/parser3mysql.C	2015/10/26 16:00:50	1.48
@@ -1,7 +1,7 @@
 /** @file
 	Parser MySQL driver.
 
-	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
 
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
@@ -15,7 +15,7 @@
 
 #include "pa_sql_driver.h"
 
-volatile const char * IDENT_PARSER3MYSQL_C="$Id: parser3mysql.C,v 1.45 2013/03/31 10:31:21 moko Exp $" IDENT_PA_SQL_DRIVER_H;
+volatile const char * IDENT_PARSER3MYSQL_C="$Id: parser3mysql.C,v 1.48 2015/10/26 16:00:50 moko Exp $" IDENT_PA_SQL_DRIVER_H;
 
 #define NO_CLIENT_LONG_LONG
 #include "mysql.h"
@@ -135,13 +135,6 @@ 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; }
 
@@ -154,7 +147,7 @@ public:
 	/**	connect
 		@param url
 			format: @b user:pass@host[:port]|[/unix/socket]/database?
-				charset=value&	// transcode by server with command 'SET CHARACTER SET value'
+				charset=value&	// transcode by server with command 'SET NAMES value'
 				ClientCharset=charset&	// transcode by parser
 				timeout=3&
 				compress=0&
@@ -270,7 +263,7 @@ public:
 		}
 
 		if(charset){
-			char statement[MAX_STRING+1]="SET CHARACTER SET ";
+			char statement[MAX_STRING+1]="SET NAMES ";
 			strncat(statement, charset, MAX_STRING);
 			_exec(connection, statement);
 		}