Patch mysqlnd-sock.patch for MySQL related Bug #60748

Patch version 2012-01-13 16:56 UTC

Obsoleted by patches:

• mysqlnd-sock.patch, revision 2012-01-13 17:27 UTC

• 2012-01-13 17:27 UTC [diff to current]
• 2012-01-13 16:56 UTC [diff to current]

Developer: fedora@famillecollet.com

diff -up php-5.4.0RC5/ext/mysqlnd/mysqlnd.c.sock php-5.4.0RC5/ext/mysqlnd/mysqlnd.c
--- php-5.4.0RC5/ext/mysqlnd/mysqlnd.c.sock	2012-01-01 14:15:04.000000000 +0100
+++ php-5.4.0RC5/ext/mysqlnd/mysqlnd.c	2012-01-13 17:27:58.808947693 +0100
@@ -695,7 +695,11 @@ MYSQLND_METHOD(mysqlnd_conn_data, connec
 		if (host_len == sizeof("localhost") - 1 && !strncasecmp(host, "localhost", host_len)) {
 			DBG_INF_FMT("socket=%s", socket_or_pipe? socket_or_pipe:"n/a");
 			if (!socket_or_pipe) {
-				socket_or_pipe = "/tmp/mysql.sock";
+#ifdef PHP_MYSQL_UNIX_SOCK_ADDR
+				socket_or_pipe = PHP_MYSQL_UNIX_SOCK_ADDR;
+#else
+				socket_or_pipe = "/var/lib/mysql/mysql.sock";
+#endif
 			}
 			transport_len = mnd_sprintf(&transport, 0, "unix://%s", socket_or_pipe);
 			unix_socket = TRUE;
diff -up ext/pdo_mysql/pdo_mysql.c.sock ext/pdo_mysql/pdo_mysql.c