tony2001 Sat Apr 14 10:42:41 2007 UTC
Modified files:
/php-src/ext/mysqli mysqli_nonapi.c mysqli_api.c
Log:
use default socket (removed by mistake?)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.69&r2=1.70&diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.69
php-src/ext/mysqli/mysqli_nonapi.c:1.70
--- php-src/ext/mysqli/mysqli_nonapi.c:1.69 Sat Apr 14 10:35:00 2007
+++ php-src/ext/mysqli/mysqli_nonapi.c Sat Apr 14 10:42:41 2007
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_nonapi.c,v 1.69 2007/04/14 10:35:00 tony2001 Exp $
+ $Id: mysqli_nonapi.c,v 1.70 2007/04/14 10:42:41 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -90,6 +90,10 @@
mysql_options(mysql->mysql, MYSQL_OPT_RECONNECT, (const char
*)&my_true);
#endif
+ if (!socket) {
+ socket = MyG(default_socket);
+ }
+
if (mysql_real_connect(mysql->mysql, hostname, username, passwd,
dbname, port, socket, CLIENT_MULTI_RESULTS) == NULL) {
/* Save error messages */
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.145&r2=1.146&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.145
php-src/ext/mysqli/mysqli_api.c:1.146
--- php-src/ext/mysqli/mysqli_api.c:1.145 Thu Mar 8 22:57:02 2007
+++ php-src/ext/mysqli/mysqli_api.c Sat Apr 14 10:42:41 2007
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.145 2007/03/08 22:57:02 stas Exp $
+ $Id: mysqli_api.c,v 1.146 2007/04/14 10:42:41 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1458,6 +1458,10 @@
flags ^= CLIENT_LOCAL_FILES;
}
+ if (!socket) {
+ socket = MyG(default_socket);
+ }
+
if (mysql_real_connect(mysql->mysql, hostname, username, passwd, dbname
,port, socket ,flags) == NULL) {
php_mysqli_set_error(mysql_errno(mysql->mysql), (char *)
mysql_error(mysql->mysql) TSRMLS_CC);
php_mysqli_throw_sql_exception( mysql->mysql->net.sqlstate,
mysql->mysql->net.last_errno TSRMLS_CC,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
