diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-07-21 23:14:42 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-07-21 23:14:42 -0700 |
| commit | b8d4a6939e7b91fe75218ab17aac9d9471ca2a6c (patch) | |
| tree | c9bcb7b78cf0d365d5308f16b6bca3686bc16a3e | |
| parent | 83ced9124ea0f7be4950b8267b518b05c70323fe (diff) | |
| parent | 1b4103c09d552c48275564c459122b67d34a9d1a (diff) | |
| download | php-git-b8d4a6939e7b91fe75218ab17aac9d9471ca2a6c.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- addressed bug #65159, Misleading configure help text for --with-mysql-sock
| -rw-r--r-- | ext/mysql/config.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4 index 5968c43346..998323d7c4 100644 --- a/ext/mysql/config.m4 +++ b/ext/mysql/config.m4 @@ -45,7 +45,7 @@ PHP_ARG_WITH(mysql, for MySQL support, mysqlnd the MySQL native driver will be used]) PHP_ARG_WITH(mysql-sock, for specified location of the MySQL UNIX socket, -[ --with-mysql-sock[=DIR] MySQL/MySQLi/PDO_MYSQL: Location of the MySQL unix socket pointer. +[ --with-mysql-sock[=SOCKPATH] MySQL/MySQLi/PDO_MYSQL: Location of the MySQL unix socket pointer. If unspecified, the default locations are searched], no, no) if test -z "$PHP_ZLIB_DIR"; then |