Browse Source

* Allow the use of the mysql client version 5.1 with TMysqlClient50Connection

git-svn-id: trunk@13781 -
joost 16 years ago
parent
commit
1ea6307a78
1 changed files with 5 additions and 3 deletions
  1. 5 3
      packages/fcl-db/src/sqldb/mysql/mysqlconn.inc

+ 5 - 3
packages/fcl-db/src/sqldb/mysql/mysqlconn.inc

@@ -338,17 +338,19 @@ begin
 end;
 end;
 
 
 procedure TConnectionName.DoInternalConnect;
 procedure TConnectionName.DoInternalConnect;
+var ClientVerStr: string;
 begin
 begin
   InitialiseMysql;
   InitialiseMysql;
+  ClientVerStr := copy(strpas(mysql_get_client_info()),1,3);
 {$IFDEF mysql50}
 {$IFDEF mysql50}
-  if copy(strpas(mysql_get_client_info()),1,3)<>'5.0' then
+  if (ClientVerStr<>'5.0') and (ClientVerStr<>'5.1') then
     Raise EInOutError.CreateFmt(SErrNotversion50,[strpas(mysql_get_client_info())]);
     Raise EInOutError.CreateFmt(SErrNotversion50,[strpas(mysql_get_client_info())]);
 {$ELSE}
 {$ELSE}
   {$IFDEF mysql41}
   {$IFDEF mysql41}
-  if copy(strpas(mysql_get_client_info()),1,3)<>'4.1' then
+  if ClientVerStr<>'4.1' then
     Raise EInOutError.CreateFmt(SErrNotversion41,[strpas(mysql_get_client_info())]);
     Raise EInOutError.CreateFmt(SErrNotversion41,[strpas(mysql_get_client_info())]);
   {$ELSE}
   {$ELSE}
-  if copy(strpas(mysql_get_client_info()),1,3)<>'4.0' then
+  if ClientVerStr<>'4.0' then
     Raise EInOutError.CreateFmt(SErrNotversion40,[strpas(mysql_get_client_info())]);
     Raise EInOutError.CreateFmt(SErrNotversion40,[strpas(mysql_get_client_info())]);
   {$ENDIF}
   {$ENDIF}
 {$ENDIF}
 {$ENDIF}