File tree Expand file tree Collapse file tree 3 files changed +9
-5
lines changed
Expand file tree Collapse file tree 3 files changed +9
-5
lines changed Original file line number Diff line number Diff line change @@ -18,7 +18,8 @@ AC_DEFUN([PHP_MYSQL_SOCKET_SEARCH], [
1818 done
1919
2020 if test -n "$MYSQL_SOCK"; then
21- AC_DEFINE_UNQUOTED ( PHP_MYSQL_UNIX_SOCK_ADDR , "$MYSQL_SOCK" , [ ] )
21+ AC_DEFINE_UNQUOTED ( [ PHP_MYSQL_UNIX_SOCK_ADDR] , [ "$MYSQL_SOCK"] ,
22+ [ The MySQL Unix socket location.] )
2223 AC_MSG_RESULT ( [ $MYSQL_SOCK] )
2324 else
2425 AC_MSG_RESULT ( [ no] )
@@ -52,7 +53,7 @@ if test "$PHP_MYSQLI" != "no"; then
5253 AC_MSG_CHECKING ( [ for MySQL UNIX socket location] )
5354 if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then
5455 MYSQL_SOCK=$PHP_MYSQL_SOCK
55- AC_DEFINE_UNQUOTED ( PHP_MYSQL_UNIX_SOCK_ADDR , "$MYSQL_SOCK" , [ ] )
56+ AC_DEFINE_UNQUOTED ( [ PHP_MYSQL_UNIX_SOCK_ADDR] , [ "$MYSQL_SOCK"] )
5657 AC_MSG_RESULT ( [ $MYSQL_SOCK] )
5758 elif test "$PHP_MYSQL_SOCK" = "yes"; then
5859 PHP_MYSQL_SOCKET_SEARCH
Original file line number Diff line number Diff line change @@ -10,7 +10,8 @@ if test "$PHP_PDO_MYSQL" != "no"; then
1010 AC_MSG_CHECKING ( [ for MySQL UNIX socket location] )
1111 if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then
1212 MYSQL_SOCK=$PHP_MYSQL_SOCK
13- AC_DEFINE_UNQUOTED ( PHP_MYSQL_UNIX_SOCK_ADDR , "$MYSQL_SOCK" , [ ] )
13+ AC_DEFINE_UNQUOTED ( [ PHP_MYSQL_UNIX_SOCK_ADDR] , [ "$MYSQL_SOCK"] ,
14+ [ The MySQL Unix socket location.] )
1415 AC_MSG_RESULT ( [ $MYSQL_SOCK] )
1516 elif test "$PHP_MYSQL_SOCK" = "yes"; then
1617 PHP_MYSQL_SOCKET_SEARCH
@@ -83,7 +84,9 @@ if test "$PHP_PDO_MYSQL" != "no"; then
8384
8485 if test -n "$PDO_MYSQL_CONFIG"; then
8586 PDO_MYSQL_SOCKET=`$PDO_MYSQL_CONFIG --socket`
86- AC_DEFINE_UNQUOTED ( PDO_MYSQL_UNIX_ADDR , "$PDO_MYSQL_SOCKET" , [ ] )
87+ AC_DEFINE_UNQUOTED ( [ PDO_MYSQL_UNIX_ADDR] , [ "$PDO_MYSQL_SOCKET"] ,
88+ [ The MySQL Unix socket location as defined by 'mysql_config' for use with
89+ the pdo_mysql extension.] )
8790 fi
8891
8992 PHP_NEW_EXTENSION([ pdo_mysql] ,
Original file line number Diff line number Diff line change @@ -43,7 +43,7 @@ ZEND_DECLARE_MODULE_GLOBALS(pdo_mysql)
4343 The default socket location is sometimes defined by configure.
4444 With libmysql `mysql_config --socket` will fill PDO_MYSQL_UNIX_ADDR
4545 and the user can use --with-mysql-sock=SOCKET which will fill
46- PDO_MYSQL_UNIX_ADDR . If both aren't set we're using mysqlnd and use
46+ PHP_MYSQL_UNIX_SOCK_ADDR . If both aren't set we're using mysqlnd and use
4747 /tmp/mysql.sock as default on *nix and NULL for Windows (default
4848 named pipe name is set in mysqlnd).
4949*/
You can’t perform that action at this time.
0 commit comments