Branch: refs/heads/QA_4_2 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 026c8184dd3702d97e231e75f7ba803da151f692 https://github.com/phpmyadmin/phpmyadmin/commit/026c8184dd3702d97e231e75f7ba... Author: Chirayu Chiripal chirayu.chiripal@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.chiripal@gmail.com

Commit: e0933c8cba1d69d858ec3d98a6d93e30978eb688 https://github.com/phpmyadmin/phpmyadmin/commit/e0933c8cba1d69d858ec3d98a6d9... Author: Marc Delisle marc@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 marc@infomarc.info

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/90a8a74afa54...e0933c8cba1d