4 files changed, 16 insertions, 9 deletions
diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config.m4
index 287a770d81..99c68bc9ba 100755
--- a/ext/pdo_mysql/config.m4
+++ b/ext/pdo_mysql/config.m4
@@ -47,7 +47,11 @@ Note that the MySQL client library is not bundled anymore!])
 	PDO_MYSQL_SOCKET=`$PDO_MYSQL_CONFIG --socket` 
   fi
 
-  AC_DEFINE_UNQUOTED(PDO_MYSQL_UNIX_ADDR, "$PDO_MYSQL_SOCKET", [ ])
+  if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then
+    AC_DEFINE_UNQUOTED(PDO_MYSQL_UNIX_ADDR, "$PHP_MYSQL_SOCK", [ ])  
+  else
+    AC_DEFINE_UNQUOTED(PDO_MYSQL_UNIX_ADDR, "$PDO_MYSQL_SOCKET", [ ])
+  fi
 
   PHP_ADD_LIBRARY_WITH_PATH(mysqlclient, $PDO_MYSQL_LIB_DIR, PDO_MYSQL_SHARED_LIBADD)
   PHP_ADD_INCLUDE($PDO_MYSQL_INC_DIR)
diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c
index 789cd5163f..81ea1d3657 100755
--- a/ext/pdo_mysql/mysql_driver.c
+++ b/ext/pdo_mysql/mysql_driver.c
@@ -417,13 +417,6 @@ static struct pdo_dbh_methods mysql_methods = {
 	pdo_mysql_check_liveness
 };
 
-#ifndef PDO_MYSQL_UNIX_ADDR
-# ifdef PHP_WIN32
-#  define PDO_MYSQL_UNIX_ADDR	"MySQL"
-# else
-#  define PDO_MYSQL_UNIX_ADDR	"/tmp/mysql.sock"
-# endif
-#endif
 
 static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_DC) /* {{{ */
 {
diff --git a/ext/pdo_mysql/pdo_mysql.c b/ext/pdo_mysql/pdo_mysql.c
index 1b293a21b4..bff9f10ac7 100755
--- a/ext/pdo_mysql/pdo_mysql.c
+++ b/ext/pdo_mysql/pdo_mysql.c
@@ -101,7 +101,8 @@ PHP_MSHUTDOWN_FUNCTION(pdo_mysql)
 PHP_MINFO_FUNCTION(pdo_mysql)
 {
 	php_info_print_table_start();
-	php_info_print_table_header(2, "PDO Driver for MySQL 3.x Client Libraries", "enabled");
+	php_info_print_table_header(2, "PDO Driver for MySQL, client library version", mysql_get_client_info());
+	php_info_print_table_row(2, "MYSQL_SOCKET", PDO_MYSQL_UNIX_ADDR);
 	php_info_print_table_end();
 }
 /* }}} */
diff --git a/ext/pdo_mysql/php_pdo_mysql_int.h b/ext/pdo_mysql/php_pdo_mysql_int.h
index d896bbc15a..65bcbd2a2b 100755
--- a/ext/pdo_mysql/php_pdo_mysql_int.h
+++ b/ext/pdo_mysql/php_pdo_mysql_int.h
@@ -87,4 +87,13 @@ enum {
 	PDO_MYSQL_ATTR_MAX_BUFFER_SIZE,
 	PDO_MYSQL_ATTR_DIRECT_QUERY,
 };
+
+#ifndef PDO_MYSQL_UNIX_ADDR
+# ifdef PHP_WIN32
+#  define PDO_MYSQL_UNIX_ADDR	"MySQL"
+# else
+#  define PDO_MYSQL_UNIX_ADDR	"/tmp/mysql.sock"
+# endif
+#endif
+
 #endif