opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2026-03-13 09:24:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #287: v5.1 servers report utf8mb4 from mysql_character_set_name, although it's latin1. Trust the returned charset only on v5.5+ servers, and reset it on older servers.

Browse Source
This commit is contained in:
Ansgar Becker
2022-06-17 14:46:45 +02:00
parent 42e2db3620
commit 66b07c0c5e
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
source/dbconnection.pas
View File

@@ -2437,19 +2437,33 @@ begin
end;
end;
// mysql_character_set_name() from libmysql.dll reports utf8* if in fact we're on some latin* charset
// We need the server version before checking the current character set
FServerVersionUntouched := GetSessionVariable('version') + ' - ' + GetSessionVariable('version_comment');
FServerVersionUntouched := FServerVersionUntouched.Trim([' ', '-']);
if FServerVersionUntouched.IsEmpty then begin
FServerVersionUntouched := DecodeAPIString(FLib.mysql_get_server_info(FHandle));
end;
// mysql_character_set_name() reports utf8* if in fact we're on some latin* charset on v5.1 servers
// See https://www.heidisql.com/forum.php?t=39278
FIsUnicode := CharacterSet.StartsWith('utf', True) and (not FParameters.LibraryOrProvider.StartsWith('libmysql', True));
FIsUnicode := CharacterSet.StartsWith('utf', True) and (ServerVersionInt >= 50500);
if not IsUnicode then
try
CharacterSet := 'utf8mb4';
except
// older servers without *mb4 support go here
on E:EDbError do try
Log(lcError, E.Message);
CharacterSet := 'utf8';
except
on E:EDbError do
// v5.1 returned "Unknown character set: 'utf8mb3'" with libmariadb
on E:EDbError do try
Log(lcError, E.Message);
Query('SET NAMES utf8');
except
// give up
on E:EDbError do
Log(lcError, E.Message);
end;
end;
end;
Log(lcInfo, _('Characterset')+': '+CharacterSet);
@@ -2467,11 +2481,6 @@ begin
FServerDateTimeOnStartup := GetVar('SELECT ' + GetSQLSpecifity(spFuncNow));
FServerOS := GetSessionVariable('version_compile_os');
FRealHostname := GetSessionVariable('hostname');
FServerVersionUntouched := GetSessionVariable('version') + ' - ' + GetSessionVariable('version_comment');
FServerVersionUntouched := FServerVersionUntouched.Trim([' ', '-']);
if FServerVersionUntouched.IsEmpty then begin
FServerVersionUntouched := DecodeAPIString(FLib.mysql_get_server_info(FHandle));
end;
FCaseSensitivity := MakeInt(GetSessionVariable('lower_case_table_names', IntToStr(FCaseSensitivity)));
// Triggers OnDatabaseChange event for <no db>