From 5e79f2c47616cba4e4dbb710caed7486b1df75a6 Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Mon, 21 Jul 2008 12:58:51 +0000 Subject: Fix for bug#45179 --with-mysql-sock fails to compile & work Now --with-mysql-sock controls all mysql extensions. If provided it will be the default value as it was set in php.ini . php.ini will override it for ext/mysql and ext/mysqli but not for pdo_mysql --- ext/mysql/php_mysql_structs.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'ext/mysql/php_mysql_structs.h') diff --git a/ext/mysql/php_mysql_structs.h b/ext/mysql/php_mysql_structs.h index c353e88a25..6220e351d1 100644 --- a/ext/mysql/php_mysql_structs.h +++ b/ext/mysql/php_mysql_structs.h @@ -42,6 +42,13 @@ #include #endif +#ifdef PHP_MYSQL_UNIX_SOCK_ADDR +#ifdef MYSQL_UNIX_ADDR +#undef MYSQL_UNIX_ADDR +#endif +#define MYSQL_UNIX_ADDR PHP_MYSQL_UNIX_SOCK_ADDR +#endif + #if (MYSQL_VERSION_ID >= 40113 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50007 || MYSQL_USE_MYSQLND #define MYSQL_HAS_SET_CHARSET #endif -- cgit v1.2.1