Cherry-picking follow-up patch for WL 5710 from mysql-5.5 to mysql-5.5.16-release.
Cherry-picking follow-up patch for WL 5710
from mysql-5.5 to mysql-5.5.16-release.

Original revision:
# revision-id: bjorn.munch@oracle.com-20110812104938-peswzao46f4lvm9p
# parent: dmitry.lenev@oracle.com-20110811155849-feyt3h7tj48padiu
# committer: Bjorn Munch <bjorn.munch@oracle.com>
# branch nick: main-55
# timestamp: Fri 2011-08-12 12:49:38 +0200
# message:
#   Small followup fix to WL 5710:
#     Test mysql_plugin failed if version string ended in -mN
ollie314/server,ollie314/server,flynn1973/mariadb-aix,flynn1973/mariadb-aix,davidl-zend/zenddbi,ollie314/server,natsys/mariadb_10.2,davidl-zend/zenddbi,flynn1973/mariadb-aix,flynn1973/mariadb-aix,flynn1973/mariadb-aix,davidl-zend/zenddbi,ollie314/server,ollie314/server,flynn1973/mariadb-aix,davidl-zend/zenddbi,flynn1973/mariadb-aix,ollie314/server,natsys/mariadb_10.2,ollie314/server,natsys/mariadb_10.2,slanterns/server,ollie314/server,davidl-zend/zenddbi,ollie314/server,natsys/mariadb_10.2,natsys/mariadb_10.2,natsys/mariadb_10.2,davidl-zend/zenddbi,ollie314/server,flynn1973/mariadb-aix,flynn1973/mariadb-aix,natsys/mariadb_10.2,ollie314/server,davidl-zend/zenddbi,davidl-zend/zenddbi,flynn1973/mariadb-aix,davidl-zend/zenddbi,natsys/mariadb_10.2,natsys/mariadb_10.2,natsys/mariadb_10.2,flynn1973/mariadb-aix,davidl-zend/zenddbi,natsys/mariadb_10.2,davidl-zend/zenddbi