File tree 3 files changed +9
-5
lines changed
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], [
18
18
done
19
19
20
20
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.] )
22
23
AC_MSG_RESULT ( [ $MYSQL_SOCK] )
23
24
else
24
25
AC_MSG_RESULT ( [ no] )
@@ -52,7 +53,7 @@ if test "$PHP_MYSQLI" != "no"; then
52
53
AC_MSG_CHECKING ( [ for MySQL UNIX socket location] )
53
54
if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then
54
55
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"] )
56
57
AC_MSG_RESULT ( [ $MYSQL_SOCK] )
57
58
elif test "$PHP_MYSQL_SOCK" = "yes"; then
58
59
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
10
10
AC_MSG_CHECKING ( [ for MySQL UNIX socket location] )
11
11
if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then
12
12
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.] )
14
15
AC_MSG_RESULT ( [ $MYSQL_SOCK] )
15
16
elif test "$PHP_MYSQL_SOCK" = "yes"; then
16
17
PHP_MYSQL_SOCKET_SEARCH
@@ -83,7 +84,9 @@ if test "$PHP_PDO_MYSQL" != "no"; then
83
84
84
85
if test -n "$PDO_MYSQL_CONFIG"; then
85
86
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.] )
87
90
fi
88
91
89
92
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)
43
43
The default socket location is sometimes defined by configure.
44
44
With libmysql `mysql_config --socket` will fill PDO_MYSQL_UNIX_ADDR
45
45
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
47
47
/tmp/mysql.sock as default on *nix and NULL for Windows (default
48
48
named pipe name is set in mysqlnd).
49
49
*/
You can’t perform that action at this time.
0 commit comments