mirror of
https://github.com/HeidiSQL/HeidiSQL.git
synced 2025-08-26 03:01:07 +08:00
Issue #677:
* drop workaround for application crash on WinXP, when loading newer libmariadb (see #79) * raise TDbLib's own exception instead of baking an own one with less details. Probably helps in debugging: https://www.heidisql.com/forum.php?t=34044 * rename EDatabaseError to EDbError, to overcome naming conflict in DB unit * load libpq.dll always with path, which should anyway work better than without it. See http://www.heidisql.com/forum.php?t=22514
This commit is contained in:
@ -2017,7 +2017,7 @@ begin
|
||||
try
|
||||
FDefiners := DBObject.Connection.GetCol('SELECT CONCAT('+q('User')+', '+esc('@')+', '+q('Host')+') FROM '+
|
||||
q('mysql')+'.'+q('user')+' WHERE '+q('User')+'!='+esc('')+' ORDER BY '+q('User')+', '+q('Host'));
|
||||
except on E:EDatabaseError do
|
||||
except on E:EDbError do
|
||||
FDefiners := TStringList.Create;
|
||||
end;
|
||||
end;
|
||||
@ -3097,7 +3097,7 @@ begin
|
||||
Inc(FRowsFound, FConnection.RowsFound);
|
||||
Inc(FWarningCount, FConnection.WarningCount);
|
||||
except
|
||||
on E:EDatabaseError do begin
|
||||
on E:EDbError do begin
|
||||
if FStopOnErrors or (i = FBatch.Count - 1) then begin
|
||||
FErrorMessage := E.Message;
|
||||
ErrorAborted := True;
|
||||
|
Reference in New Issue
Block a user