diff options
| author | Andrey Hristov <andrey@php.net> | 2008-07-21 12:58:51 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2008-07-21 12:58:51 +0000 |
| commit | 5e79f2c47616cba4e4dbb710caed7486b1df75a6 (patch) | |
| tree | 94ca08698824cd9f99c53be6e898aaddd9c56511 /ext/mysql/php_mysql_structs.h | |
| parent | ee40f557a7119845b4311e732c6b797ab44e83e5 (diff) | |
| download | php-git-5e79f2c47616cba4e4dbb710caed7486b1df75a6.tar.gz | |
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
Diffstat (limited to 'ext/mysql/php_mysql_structs.h')
| -rw-r--r-- | ext/mysql/php_mysql_structs.h | 7 |
1 files changed, 7 insertions, 0 deletions
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 <mysql.h> #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 |