[Maria-developers] Rev 2749: Merge in file:///home/psergey/dev/maria-5.1-table-elim-r12/