paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-08 17:48:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fixed small merging bug by Michael

Browse Source
This commit is contained in:
sg 2000-12-03 13:41:39 +00:00
parent 6019317548
commit cfe0286b0b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/mysql/mysql.pp
View File

@ -1,3 +1,5 @@
{ $Id$ }
unit mysql;
{
@ -283,12 +285,8 @@ begin
mysql_field_tell:=res^.current_field
end;
Function mysql_affected_rows(mysql : PMYSQL): Cardinal;
<<<<<<< mysql.pp
=======
Function mysql_affected_rows(mysql : PMYSQL): my_ulonglong;
>>>>>>> 1.1.2.1
begin
mysql_affected_rows:=mysql^.affected_rows
end;
@ -327,7 +325,10 @@ end.
{
$Log$
Revision 1.3 2000-12-02 15:24:37 michael
Revision 1.4 2000-12-03 13:41:39 sg
* Fixed small merging bug by Michael
Revision 1.3 2000/12/02 15:24:37 michael
+ Merged changes from fixbranch
}