Description:
------------
Build against a mysql-source-build 5.1.20 beta with prefix /usr/local/mysql/ fails.

This is not a big problem and installing mysql-devel and building against this with 5.0.x client-library is a workaround, but it think this should be fixed.

In file included from /usr/local/mysql/include/mysql/mysql.h:66,
                 from /data/development/src/php/ext/mysql/php_mysql.c:67:
/usr/local/mysql/include/mysql/mysql_version.h:18:1: warning: "MYSQL_UNIX_ADDR" redefined
In file included from /data/development/src/php/TSRM/tsrm_config.h:1,
                 from /data/development/src/php/TSRM/tsrm_config_common.h:13,
                 from /data/development/src/php/TSRM/tsrm_virtual_cwd.h:26,
                 from /data/development/src/php/main/php.h:409,
                 from /data/development/src/php/ext/mysql/php_mysql.c:32:
/data/development/src/php/include/../main/php_config.h:1903:1: warning: this is the location of the previous definition
/bin/sh /data/development/src/php/libtool --silent --preserve-dup-deps --mode=compile gcc  -Iext/mysqli/ -I/data/development/src/php/ext/mysqli/ -DPHP_ATOM_INC -I/data/development/src/php/include -I/data/development/src/php/main -I/data/development/src/php -I/usr/include/libxml2 -I/usr/kerberos/include -I/data/development/src/php/ext/date/lib -I/usr/include/freetype2 -I/usr/include/imap -I/data/development/src/php/ext/mbstring/oniguruma -I/data/development/src/php/ext/mbstring/libmbfl -I/data/development/src/php/ext/mbstring/libmbfl/mbfl -I/usr/local/mysql/include/mysql -I/usr/include/mysql -I/data/development/src/php/TSRM -I/data/development/src/php/Zend    -I/usr/include -O3 -march=i686 -mcpu=i686 -mtune=i686 -mmmx -msse2 -fopenmp -mfpmath=sse,387 -pipe -ffast-math  -prefer-non-pic -c /data/development/src/php/ext/mysqli/mysqli.c -o ext/mysqli/mysqli.lo
In file included from /usr/local/mysql/include/mysql/mysql.h:66,
                 from /data/development/src/php/ext/mysqli/php_mysqli.h:28,
                 from /data/development/src/php/ext/mysqli/mysqli.c:31:
/usr/local/mysql/include/mysql/mysql_version.h:18:1: warning: "MYSQL_UNIX_ADDR" redefined
In file included from /data/development/src/php/TSRM/tsrm_config.h:1,
                 from /data/development/src/php/TSRM/tsrm_config_common.h:13,
                 from /data/development/src/php/TSRM/tsrm_virtual_cwd.h:26,
                 from /data/development/src/php/main/php.h:409,
                 from /data/development/src/php/ext/mysqli/mysqli.c:27:
/data/development/src/php/include/../main/php_config.h:1903:1: warning: this is the location of the previous definition
/bin/sh /data/development/src/php/libtool --silent --preserve-dup-deps --mode=compile gcc  -Iext/mysqli/ -I/data/development/src/php/ext/mysqli/ -DPHP_ATOM_INC -I/data/development/src/php/include -I/data/development/src/php/main -I/data/development/src/php -I/usr/include/libxml2 -I/usr/kerberos/include -I/data/development/src/php/ext/date/lib -I/usr/include/freetype2 -I/usr/include/imap -I/data/development/src/php/ext/mbstring/oniguruma -I/data/development/src/php/ext/mbstring/libmbfl -I/data/development/src/php/ext/mbstring/libmbfl/mbfl -I/usr/local/mysql/include/mysql -I/usr/include/mysql -I/data/development/src/php/TSRM -I/data/development/src/php/Zend    -I/usr/include -O3 -march=i686 -mcpu=i686 -mtune=i686 -mmmx -msse2 -fopenmp -mfpmath=sse,387 -pipe -ffast-math  -prefer-non-pic -c /data/development/src/php/ext/mysqli/mysqli_api.c -o ext/mysqli/mysqli_api.lo
In file included from /usr/local/mysql/include/mysql/mysql.h:66,
                 from /data/development/src/php/ext/mysqli/php_mysqli.h:28,
                 from /data/development/src/php/ext/mysqli/mysqli_api.c:30:
/usr/local/mysql/include/mysql/mysql_version.h:18:1: warning: "MYSQL_UNIX_ADDR" redefined
In file included from /data/development/src/php/TSRM/tsrm_config.h:1,
                 from /data/development/src/php/TSRM/tsrm_config_common.h:13,
                 from /data/development/src/php/TSRM/tsrm_virtual_cwd.h:26,
                 from /data/development/src/php/main/php.h:409,
                 from /data/development/src/php/ext/mysqli/mysqli_api.c:27:
/data/development/src/php/include/../main/php_config.h:1903:1: warning: this is the location of the previous definition
/data/development/src/php/ext/mysqli/mysqli_api.c: In function 'zif_mysqli_stmt_bind_param':
/data/development/src/php/ext/mysqli/mysqli_api.c:144: error: 'gptr' undeclared (first use in this function)
/data/development/src/php/ext/mysqli/mysqli_api.c:144: error: (Each undeclared identifier is reported only once
/data/development/src/php/ext/mysqli/mysqli_api.c:144: error: for each function it appears in.)
/data/development/src/php/ext/mysqli/mysqli_api.c: In function 'zif_mysqli_stmt_execute':
/data/development/src/php/ext/mysqli/mysqli_api.c:603: error: 'gptr' undeclared (first use in this function)


Reproduce code:
---------------
Build Mysql 5.1.20 with --prefix=/usr/local/mysql
Build PHP with --with-mysql=/usr/local/mysql

Expected result:
----------------
A php-build with mysql 5.1 client-library

Actual result:
--------------
Compile fails