paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-21 18:09:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

--- Merging r31306 into '.':

Browse Source 
U    packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
--- Recording mergeinfo for merge of r31306 into '.':
 U   .

# revisions: 31306

git-svn-id: branches/fixes_3_0@31554 -
This commit is contained in:
marco 2015-09-06 17:18:27 +00:00
parent a51d4636d4
commit 897ec073e5
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -392,9 +392,8 @@ begin
end;
end;
HMySQL:=mysql_real_connect(HMySQL,PChar(HostName),PChar(UserName),PChar(Password),Nil,APort,Nil,CLIENT_MULTI_RESULTS); //CLIENT_MULTI_RESULTS is required by CALL SQL statement(executes stored procedure), that produces result sets
If (HMySQL=Nil) then
MySQLError(Nil,SErrServerConnectFailed,Self);
if mysql_real_connect(HMySQL,PChar(HostName),PChar(UserName),PChar(Password),Nil,APort,Nil,CLIENT_MULTI_RESULTS) = nil then //CLIENT_MULTI_RESULTS is required by CALL SQL statement(executes stored procedure), that produces result sets
MySQLError(HMySQL,SErrServerConnectFailed,Self);
if (trim(CharSet) <> '') then
// major_version*10000 + minor_version *100 + sub_version