[Maria-developers] Rev 2738: merge 5.1->5.2 in file:///home/bell/maria/bzr/work-maria-5.2-merge-5.1/