Browse Source

fcl-db: mysql: for BINARY and VARBINARY data types ignore connection CharSet (CharSize does not play role here)

git-svn-id: trunk@39002 -
lacak 7 years ago
parent
commit
7b7d9b1cde
1 changed files with 5 additions and 2 deletions
  1. 5 2
      packages/fcl-db/src/sqldb/mysql/mysqlconn.inc

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

@@ -765,12 +765,15 @@ begin
       else
       else
         NewType := ftString;
         NewType := ftString;
 {$IFDEF MYSQL50_UP}
 {$IFDEF MYSQL50_UP}
-      if AField^.charsetnr = 63 then //BINARY vs. CHAR, VARBINARY vs. VARCHAR
+      if AField^.charsetnr = 63 then begin //BINARY vs. CHAR, VARBINARY vs. VARCHAR
         if NewType = ftFixedChar then
         if NewType = ftFixedChar then
           NewType := ftBytes
           NewType := ftBytes
         else
         else
           NewType := ftVarBytes;
           NewType := ftVarBytes;
-      NewSize := ASize div FConnectionCharsetInfo.mbmaxlen;
+        NewSize := ASize;
+      end
+      else
+        NewSize := ASize div FConnectionCharsetInfo.mbmaxlen;
 {$ELSE}
 {$ELSE}
       NewSize := ASize;
       NewSize := ASize;
 {$ENDIF}
 {$ENDIF}