* Merging revisions 42344 from trunk:

    ------------------------------------------------------------------------
    r42344 | michael | 2019-07-08 12:27:11 +0200 (Mon, 08 Jul 2019) | 1 line
    
    * Fix bug ID #35796, codepage issue when getting string as variant
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@42851 -

packages/fcl-db/src/base/fields.inc

@@ -1202,7 +1202,10 @@ var s : rawbytestring;
 
 begin
   If GetValue(s) then
+    begin
+    SetCodePage(s, CP_ACP, True); 
     Result:=s
+    end
   else
     Result:=Null;
 end;