tony2001 Fri, 21 Aug 2009 07:46:43 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=287530
Log: fix build broken by the fix for bug #49306 Bug: http://bugs.php.net/49306 (Closed) socket settings are ignored Changed paths: 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/ext/pdo_mysql/mysql_driver.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c 2009-08-21 07:42:16 UTC (rev 287529) +++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c 2009-08-21 07:46:43 UTC (rev 287530) @@ -551,11 +551,12 @@ pdo_mysql_check_liveness }; /* }}} */ - -#ifdef PHP_WIN32 -# define MYSQL_UNIX_ADDR "MySQL" -#else -# define MYSQL_UNIX_ADDR PDO_MYSQL_G(default_socket) +#ifdef PDO_USE_MYSQLND +# ifdef PHP_WIN32 +# define MYSQL_UNIX_ADDR "MySQL" +# else +# define MYSQL_UNIX_ADDR PDO_MYSQL_G(default_socket) +# endif #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-21 07:42:16 UTC (rev 287529) +++ php/php-src/trunk/ext/pdo_mysql/mysql_driver.c 2009-08-21 07:46:43 UTC (rev 287530) @@ -552,10 +552,12 @@ }; /* }}} */ -#ifdef PHP_WIN32 -# define MYSQL_UNIX_ADDR "MySQL" -#else -# define MYSQL_UNIX_ADDR PDO_MYSQL_G(default_socket) +#ifdef PDO_USE_MYSQLND +# ifdef PHP_WIN32 +# define MYSQL_UNIX_ADDR "MySQL" +# else +# define MYSQL_UNIX_ADDR PDO_MYSQL_G(default_socket) +# endif #endif /* {{{ pdo_mysql_handle_factory */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
