[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d4c221: Fix #4619 SELECT LENGTH(`field`) FROM does not so...

Marc Delisle marc at infomarc.info
Mon Dec 8 13:57:14 CET 2014


  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: d4c221160a1e2d33df107ac8caf1095baea3ebb9
      https://github.com/phpmyadmin/phpmyadmin/commit/d4c221160a1e2d33df107ac8caf1095baea3ebb9
  Author: Hugues Peccatte <hugues.peccatte at 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 at gmail.com>


  Commit: 5b6c0d069362aa8eaec07cfddea796b7c96b27ea
      https://github.com/phpmyadmin/phpmyadmin/commit/5b6c0d069362aa8eaec07cfddea796b7c96b27ea
  Author: Hugues Peccatte <hugues.peccatte at 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 at gmail.com>


  Commit: 18477cc467378452a618373d141a21b2de8bd340
      https://github.com/phpmyadmin/phpmyadmin/commit/18477cc467378452a618373d141a21b2de8bd340
  Author: Marc Delisle <marc at 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 at infomarc.info>


  Commit: 0958d981e1baf4291f8145a99480d68e2e08b3d2
      https://github.com/phpmyadmin/phpmyadmin/commit/0958d981e1baf4291f8145a99480d68e2e08b3d2
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

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

  Log Message:
  -----------
  Merge branch 'QA_4_3'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b02758e38324...0958d981e1ba


More information about the Git mailing list