svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c trunk/ext/pdo_mysql/mysql_driver.c
| From: | Ilia Alshanetsky | Date: | Thu, 20 Aug 2009 12:13:38 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c trunk/ext/pdo_mysql/mysql_driver.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-60192@lists.php.net to get a copy of this message | ||
iliaa Thu, 20 Aug 2009 12:13:38 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=287504
Log:
Fixed bug #49306 (inside pdo_mysql default socket settings are ignored).
Bug: http://bugs.php.net/49306 (Open) socket settings are
ignored
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c
U php/php-src/trunk/ext/pdo_mysql/mysql_driver.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2009-08-20 11:47:19 UTC (rev 287503)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-08-20 12:13:38 UTC (rev 287504)
@@ -22,6 +22,8 @@
- Fixed memory leak in stream_is_local(). (Felipe, Tony)
- Fixed BC break in mime_content_type(), removes the content encoding. (Scott)
+- Fixed bug #49306 (inside pdo_mysql default socket settings are ignored).
+ (Ilia)
- Fixed bug #49289 (bcmath module doesn't compile with phpize configure).
(Jani)
- Fixed bug #49269 (Ternary operator fails on Iterator object when used inside
Modified: php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c 2009-08-20 11:47:19 UTC (rev 287503)
+++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c 2009-08-20 12:13:38 UTC (rev 287504)
@@ -552,12 +552,10 @@
};
/* }}} */
-#ifndef PDO_MYSQL_UNIX_ADDR
-# ifdef PHP_WIN32
-# define MYSQL_UNIX_ADDR "MySQL"
-# else
-# define MYSQL_UNIX_ADDR PDO_MYSQL_G(default_socket)
-# endif
+#ifdef PHP_WIN32
+# define MYSQL_UNIX_ADDR "MySQL"
+#else
+# define MYSQL_UNIX_ADDR PDO_MYSQL_G(default_socket)
#endif
/* {{{ pdo_mysql_handle_factory */
Modified: php/php-src/trunk/ext/pdo_mysql/mysql_driver.c
===================================================================
--- php/php-src/trunk/ext/pdo_mysql/mysql_driver.c 2009-08-20 11:47:19 UTC (rev 287503)
+++ php/php-src/trunk/ext/pdo_mysql/mysql_driver.c 2009-08-20 12:13:38 UTC (rev 287504)
@@ -552,12 +552,10 @@
};
/* }}} */
-#ifndef PDO_MYSQL_UNIX_ADDR
-# ifdef PHP_WIN32
-# define MYSQL_UNIX_ADDR "MySQL"
-# else
-# define MYSQL_UNIX_ADDR PDO_MYSQL_G(default_socket)
-# endif
+#ifdef PHP_WIN32
+# define MYSQL_UNIX_ADDR "MySQL"
+#else
+# define MYSQL_UNIX_ADDR PDO_MYSQL_G(default_socket)
#endif
/* {{{ pdo_mysql_handle_factory */