Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 026c8184dd3702d97e231e75f7ba803da151f692
      
https://github.com/phpmyadmin/phpmyadmin/commit/026c8184dd3702d97e231e75f7ba803da151f692
  Author: Chirayu Chiripal <chirayu.chiri...@gmail.com>
  Date:   2014-06-25 (Wed, 25 Jun 2014)

  Changed paths:
    M ChangeLog
    M libraries/sql.lib.php

  Log Message:
  -----------
  bug-4473: incorrect result count when having clause is used w/o group by

Signed-off-by: Chirayu Chiripal <chirayu.chiri...@gmail.com>


  Commit: e0933c8cba1d69d858ec3d98a6d93e30978eb688
      
https://github.com/phpmyadmin/phpmyadmin/commit/e0933c8cba1d69d858ec3d98a6d93e30978eb688
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2014-06-25 (Wed, 25 Jun 2014)

  Changed paths:
    M ChangeLog
    M libraries/sql.lib.php

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

Signed-off-by: Marc Delisle <m...@infomarc.info>


  Commit: e1b598ff1e6f68eafc9a57bcc5838d2d8148ca1a
      
https://github.com/phpmyadmin/phpmyadmin/commit/e1b598ff1e6f68eafc9a57bcc5838d2d8148ca1a
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2014-06-25 (Wed, 25 Jun 2014)

  Changed paths:
    M ChangeLog
    M libraries/sql.lib.php

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

Signed-off-by: Marc Delisle <m...@infomarc.info>


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/6be21dcb470a...e1b598ff1e6f
------------------------------------------------------------------------------
Open source business process management suite built on Java and Eclipse
Turn processes into business applications with Bonita BPM Community Edition
Quickly connect people, data, and systems into organized workflows
Winner of BOSSIE, CODIE, OW2 and Gartner awards
http://p.sf.net/sfu/Bonitasoft
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to