[Maria-developers] Please review a simple patch changing shift/reduce conflicts from 160 to 121