paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-12-04 19:27:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Better fix for mantis 17661, see r17077

Browse Source 
git-svn-id: trunk@17179 -
This commit is contained in:
joost 2011-03-25 18:11:58 +00:00
parent c31f04b9c1
commit e21bf87bc2
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/fcl-db/src/sqldb/mysql/mysql50conn.pas
View File

@ -4,6 +4,7 @@
unit mysql50conn;
{$DEFINE MYSQL50_up}
{$DEFINE MYSQL50}
{$i mysqlconn.inc}

2
packages/fcl-db/src/sqldb/mysql/mysql51conn.pas
View File

@ -4,6 +4,8 @@
unit mysql51conn;
{$DEFINE MYSQL50_UP}
{$DEFINE MYSQL51_UP}
{$DEFINE MYSQL51}
{$i mysqlconn.inc}

10
packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
View File

@ -188,12 +188,8 @@ const
'MYSQL_OPT_USE_REMOTE_CONNECTION','MYSQL_OPT_USE_EMBEDDED_CONNECTION',
'MYSQL_OPT_GUESS_CONNECTION','MYSQL_SET_CLIENT_IP',
'MYSQL_SECURE_AUTH'
{$IFDEF MYSQL50}
{$IFDEF MYSQL50_UP}
,'MYSQL_REPORT_DATA_TRUNCATION', 'MYSQL_OPT_RECONNECT'
{$ELSE}
{$IFDEF MYSQL51}
,'MYSQL_REPORT_DATA_TRUNCATION', 'MYSQL_OPT_RECONNECT'
{$ENDIF}
{$ENDIF}
);
@ -559,7 +555,7 @@ begin
NewType := ftInteger;
NewSize := 0;
end;
{$if defined(mysql51) or defined(mysql50)}
{$ifdef mysql50_up}
FIELD_TYPE_NEWDECIMAL,
{$endif}
FIELD_TYPE_DECIMAL: if ADecimals < 5 then
@ -867,7 +863,7 @@ begin
VL := 0;
Move(VL, Dest^, SizeOf(LargeInt));
end;
{$if defined(mysql51) or defined(mysql50)}
{$ifdef mysql50_up}
FIELD_TYPE_NEWDECIMAL,
{$endif}
FIELD_TYPE_DECIMAL, FIELD_TYPE_FLOAT, FIELD_TYPE_DOUBLE: