Backport into build-200909221805-5.1.37sp1
Backport into build-200909221805-5.1.37sp1

> ------------------------------------------------------------
> revno: 2949.5.6
> revision-id: jperkin@sun.com-20090824091334-6ktgrhq218vl7zq1
> parent: joerg@mysql.com-20090821095644-12woawc4d2d3u7k4
> committer: Jonathan Perkin <jperkin@sun.com>
> branch nick: mysql-5.1-build
> timestamp: Mon 2009-08-24 10:13:34 +0100
> message:
>   Apply changes from mysql-5.1.38-release clone:
>   
>    - Add conditionals for bundled zlib and innodb plugin.
>    - Apply patch from bug#46834 to install the test suite in RPMs.
>    - Add plugins to RPMs.  Disable example plugins.

ollie314/server,flynn1973/mariadb-aix,natsys/mariadb_10.2,ollie314/server,davidl-zend/zenddbi,davidl-zend/zenddbi,davidl-zend/zenddbi,flynn1973/mariadb-aix,flynn1973/mariadb-aix,ollie314/server,flynn1973/mariadb-aix,ollie314/server,flynn1973/mariadb-aix,natsys/mariadb_10.2,natsys/mariadb_10.2,ollie314/server,flynn1973/mariadb-aix,davidl-zend/zenddbi,ollie314/server,flynn1973/mariadb-aix,davidl-zend/zenddbi,davidl-zend/zenddbi,natsys/mariadb_10.2,natsys/mariadb_10.2,flynn1973/mariadb-aix,ollie314/server,natsys/mariadb_10.2,ollie314/server,ollie314/server,slanterns/server,natsys/mariadb_10.2,natsys/mariadb_10.2,flynn1973/mariadb-aix,flynn1973/mariadb-aix,flynn1973/mariadb-aix,davidl-zend/zenddbi,natsys/mariadb_10.2,ollie314/server,natsys/mariadb_10.2,davidl-zend/zenddbi,davidl-zend/zenddbi,davidl-zend/zenddbi,davidl-zend/zenddbi,ollie314/server,natsys/mariadb_10.2