--- sql/mysql/parser3mysql.C 2015/07/28 17:10:57 1.47 +++ sql/mysql/parser3mysql.C 2017/06/24 20:29:24 1.50 @@ -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 (http://paf.design.ru) @@ -15,7 +15,7 @@ #include "pa_sql_driver.h" -volatile const char * IDENT_PARSER3MYSQL_C="$Id: parser3mysql.C,v 1.47 2015/07/28 17:10:57 moko Exp $" IDENT_PA_SQL_DRIVER_H; +volatile const char * IDENT_PARSER3MYSQL_C="$Id: parser3mysql.C,v 1.50 2017/06/24 20:29:24 moko Exp $" IDENT_PA_SQL_DRIVER_H; #define NO_CLIENT_LONG_LONG #include "mysql.h" @@ -107,8 +107,9 @@ inline static bool is_column_transcode_r case MYSQL_TYPE_LONG_BLOB: return false; break; + default: + return true; } - return true; } inline static const char* strdup(SQL_Driver_services& services, char* str, size_t length) { @@ -251,14 +252,7 @@ public: } } - if(!mysql_real_connect( - connection.handle, - host, user, pwd, db, - port?port:MYSQL_PORT, - unix_socket, - client_flag - ) - ){ + if(!mysql_real_connec(connection.handle, host, user, pwd, db, port, unix_socket, client_flag)){ services._throw(mysql_error(connection.handle)); }