From 74b7b7b79cdb94e0808c5714aebd2abde9c702a1 Mon Sep 17 00:00:00 2001 From: marco Date: Tue, 24 Nov 2009 11:14:12 +0000 Subject: * real_connect "db" parameter added which was added in 3.22. Mants 15041, but dled mysql 3.23 to verify. git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@14264 3ad0048d-3df7-0310-abae-a5850022a9f2 --- packages/mysql/src/mysql3.pp | 2 +- packages/mysql/src/mysql3dyn.pp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'packages/mysql') diff --git a/packages/mysql/src/mysql3.pp b/packages/mysql/src/mysql3.pp index 6b873d6399..50f9619ad5 100644 --- a/packages/mysql/src/mysql3.pp +++ b/packages/mysql/src/mysql3.pp @@ -2,7 +2,6 @@ unit mysql3; {$undef use_mysql_321} { if undefined, use mysql 3.23 interface } - { Import unit for the mysql header files. @@ -60,6 +59,7 @@ Function mysql_error(mysql : PMYSQL) : pchar; extdecl; external mysqllib; function mysql_init(mysql: PMYSQL) : PMYSQL;extdecl; external mysqllib name 'mysql_init'; function mysql_connect (mysql : PMYSQL; host,user,passwd: pchar) : PMYSQL;extdecl; external mysqllib name 'mysql_connect'; function mysql_real_connect (mysql : PMYSQL; const host,user,passwd : pchar; + {$ifndef use_mysql_321} const db : Pchar; {$endif} // strictly speaking 3.22+ not 3.21+ port : cardinal; unix_socket : pchar; clientflag : cardinal) : PMYSQL;extdecl; external mysqllib; diff --git a/packages/mysql/src/mysql3dyn.pp b/packages/mysql/src/mysql3dyn.pp index 1c4f7a3bd2..723ce76402 100644 --- a/packages/mysql/src/mysql3dyn.pp +++ b/packages/mysql/src/mysql3dyn.pp @@ -52,6 +52,7 @@ var mysql_init : function(mysql: PMYSQL) : PMYSQL;extdecl; mysql_connect : function(mysql : PMYSQL; host,user,passwd: pchar) : PMYSQL;extdecl; mysql_real_connect : function(mysql : PMYSQL; const host,user,passwd : pchar; + {$ifndef use_mysql_321} const db : Pchar; {$endif} // strictly speaking 3.22+ not 3.21+ port : cardinal; unix_socket : pchar; clientflag : cardinal) : PMYSQL;extdecl; -- cgit v1.2.1