[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2845: Fixed a problem of merge from mysql-5.1 baseline.