|
Lines 668-673
Link Here
|
| 668 |
if (connect_timeout != -1) |
668 |
if (connect_timeout != -1) |
| 669 |
mysql_options(&mysql->conn, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&connect_timeout); |
669 |
mysql_options(&mysql->conn, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&connect_timeout); |
| 670 |
|
670 |
|
|
|
671 |
mysql_options(&mysql->conn,MYSQL_READ_DEFAULT_GROUP,"client"); |
| 672 |
|
| 671 |
if (mysql_real_connect(&mysql->conn, host, user, passwd, NULL, port, socket, client_flags)==NULL) { |
673 |
if (mysql_real_connect(&mysql->conn, host, user, passwd, NULL, port, socket, client_flags)==NULL) { |
| 672 |
#else |
674 |
#else |
| 673 |
if (mysql_connect(&mysql->conn, host, user, passwd)==NULL) { |
675 |
if (mysql_connect(&mysql->conn, host, user, passwd)==NULL) { |
|
Lines 773-778
Link Here
|
| 773 |
if (connect_timeout != -1) |
775 |
if (connect_timeout != -1) |
| 774 |
mysql_options(&mysql->conn, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&connect_timeout); |
776 |
mysql_options(&mysql->conn, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&connect_timeout); |
| 775 |
|
777 |
|
|
|
778 |
mysql_options(&mysql->conn,MYSQL_READ_DEFAULT_GROUP,"client"); |
| 779 |
|
| 776 |
if (mysql_real_connect(&mysql->conn, host, user, passwd, NULL, port, socket, client_flags)==NULL) { |
780 |
if (mysql_real_connect(&mysql->conn, host, user, passwd, NULL, port, socket, client_flags)==NULL) { |
| 777 |
#else |
781 |
#else |
| 778 |
if (mysql_connect(&mysql->conn, host, user, passwd)==NULL) { |
782 |
if (mysql_connect(&mysql->conn, host, user, passwd)==NULL) { |
