Branch: refs/heads/QA_4_1 Home: https://github.com/phpmyadmin/phpmyadmin Commit: f220ef2c729aec03de6bdfc8f22bb0e7b549672a https://github.com/phpmyadmin/phpmyadmin/commit/f220ef2c729aec03de6bdfc8f22b... Author: Ashutosh Dhundhara ashutoshdhundhara@yahoo.com Date: 2014-04-11 (Fri, 11 Apr 2014)

Changed paths: M libraries/sql.lib.php

Log Message: ----------- Bug Fix: #4356 GROUPed selects show number of rows as if not grouped.

Signed-off-by: Ashutosh Dhundhara ashutoshdhundhara@yahoo.com

Minor fix for group_by_clause condition.

Signed-off-by: Ashutosh Dhundhara ashutoshdhundhara@yahoo.com

Commit: 2e5f178024b5b962485ff7a9301e3af043c19252 https://github.com/phpmyadmin/phpmyadmin/commit/2e5f178024b5b962485ff7a9301e... Author: Marc Delisle marc@infomarc.info Date: 2014-04-11 (Fri, 11 Apr 2014)

Changed paths: M libraries/sql.lib.php

Log Message: ----------- Merge pull request #1135 from ashutoshdhundhara/bug_4356

Bug Fix: #4356 GROUPed selects show number of rows as if not grouped.

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5fb647cb8311...2e5f178024b5