1. Why are you constantly not merging stuff to HEAD?
2. Isn't this related to bug #50231 and why are you not using the proper commit
message then? Hint: - Fixed bug..
It's getting quite annoying that some people (Rasmus included) tend to ignore
that we have a development branch (HEAD, trunk) and play around with a sort of
stable branches. You're not above anyone, please adhere to the rules like the
rest of us do..
--Jani
Gwynne Raskind wrote:
gwynne Sat, 28 Nov 2009 21:11:39 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=291399
Log:
socket location needs to be checked before mysqlnd in order for
--with-mysql-sock to work with mysqlnd
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysql/config.m4
Modified: php/php-src/branches/PHP_5_3/ext/mysql/config.m4
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysql/config.m4 2009-11-28 19:48:38 UTC
(rev 291398)
+++ php/php-src/branches/PHP_5_3/ext/mysql/config.m4 2009-11-28 21:11:39 UTC
(rev 291399)
@@ -53,23 +53,24 @@
[ --with-zlib-dir[=DIR] MySQL: Set the path to libz install prefix],
no, no)
fi
+AC_MSG_CHECKING([for MySQL UNIX socket location])
+if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then
+ MYSQL_SOCK=$PHP_MYSQL_SOCK
+ AC_DEFINE_UNQUOTED(PHP_MYSQL_UNIX_SOCK_ADDR, "$MYSQL_SOCK", [ ])
+ AC_MSG_RESULT([$MYSQL_SOCK])
+elif test "$PHP_MYSQL" = "yes" || test "$PHP_MYSQL_SOCK" = "yes"; then
+ PHP_MYSQL_SOCKET_SEARCH
+else
+ AC_MSG_RESULT([no])
+fi
+
+
if test "$PHP_MYSQL" = "mysqlnd"; then
dnl enables build of mysqnd library
PHP_MYSQLND_ENABLED=yes
elif test "$PHP_MYSQL" != "no"; then
- AC_MSG_CHECKING([for MySQL UNIX socket location])
- if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then
- MYSQL_SOCK=$PHP_MYSQL_SOCK
- AC_DEFINE_UNQUOTED(PHP_MYSQL_UNIX_SOCK_ADDR, "$MYSQL_SOCK", [ ])
- AC_MSG_RESULT([$MYSQL_SOCK])
- elif test "$PHP_MYSQL" = "yes" || test "$PHP_MYSQL_SOCK" = "yes"; then
- PHP_MYSQL_SOCKET_SEARCH
- else
- AC_MSG_RESULT([no])
- fi
-
MYSQL_DIR=
MYSQL_INC_DIR=
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
