diff --git a/harbour/ChangeLog b/harbour/ChangeLog index d57568c638..38eb438fdb 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,11 @@ The license applies to all entries newer than 2009-04-28. */ +2010-08-25 15:57 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) + * harbour/contrib/sddmy/sddmy.c + * extended RDDINFO( RDDI_CONNECT, ) to support all parameters of MySql + connect, i.e. port, unix socket name, and client flags were added. + 2010-08-25 09:44 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * package/mpkg_win_nightly.bat + Upload logs even if build failed. diff --git a/harbour/contrib/sddmy/sddmy.c b/harbour/contrib/sddmy/sddmy.c index 2043a88f57..b1a8a26219 100644 --- a/harbour/contrib/sddmy/sddmy.c +++ b/harbour/contrib/sddmy/sddmy.c @@ -155,10 +155,17 @@ static HB_USHORT hb_errRT_MySQLDD( HB_ERRCODE errGenCode, HB_ERRCODE errSubCode, static HB_ERRCODE mysqlConnect( SQLDDCONNECTION * pConnection, PHB_ITEM pItem ) { MYSQL * pMySql; + PHB_ITEM pItemUnixSocket = hb_arrayGetItemPtr( pItem, 7 ); pMySql = mysql_init( NULL ); - if ( ! mysql_real_connect( pMySql, hb_arrayGetCPtr( pItem, 2 ), hb_arrayGetCPtr( pItem, 3 ), hb_arrayGetCPtr( pItem, 4 ), - hb_arrayGetCPtr( pItem, 5 ), 0 /* port */, NULL /* pipe */, 0 /* flags*/ ) ) + if ( ! mysql_real_connect( pMySql, + hb_arrayGetCPtr( pItem, 2 ) /* host */, + hb_arrayGetCPtr( pItem, 3 ) /* user */, + hb_arrayGetCPtr( pItem, 4 ) /* password */, + hb_arrayGetCPtr( pItem, 5 ) /* db */, + hb_arrayGetNI( pItem, 6 ) /* port */, + pItemUnixSocket && HB_IS_STRING( pItemUnixSocket ) ? hb_itemGetCPtr( pItemUnixSocket ) : NULL, + hb_arrayGetNI( pItem, 8 ) /* flags*/ ) ) { hb_rddsqlSetError( mysql_errno( pMySql ), mysql_error( pMySql ), NULL, NULL, 0 ); mysql_close( pMySql );