Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: d4c221160a1e2d33df107ac8caf1095baea3ebb9 https://github.com/phpmyadmin/phpmyadmin/commit/d4c221160a1e2d33df107ac8caf1... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-12-07 (Sun, 07 Dec 2014)

Changed paths: M libraries/DisplayResults.class.php

Log Message: ----------- Fix #4619 SELECT LENGTH(`field`) FROM does not sort

Signed-off-by: Hugues Peccatte hugues.peccatte@gmail.com

Commit: 5b6c0d069362aa8eaec07cfddea796b7c96b27ea https://github.com/phpmyadmin/phpmyadmin/commit/5b6c0d069362aa8eaec07cfddea7... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-12-07 (Sun, 07 Dec 2014)

Changed paths: M ChangeLog

Log Message: ----------- Update ChangeLog.

Signed-off-by: Hugues Peccatte hugues.peccatte@gmail.com

Commit: 18477cc467378452a618373d141a21b2de8bd340 https://github.com/phpmyadmin/phpmyadmin/commit/18477cc467378452a618373d141a... Author: Marc Delisle marc@infomarc.info Date: 2014-12-08 (Mon, 08 Dec 2014)

Changed paths: M ChangeLog M libraries/DisplayResults.class.php

Log Message: ----------- Fix merge conflict

Signed-off-by: Marc Delisle marc@infomarc.info

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5233ee8bb109...18477cc46737