Branch: refs/heads/master 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. Commit: 1842f1348805b63ba49dff68be2267e0c3081235 https://github.com/phpmyadmin/phpmyadmin/commit/1842f1348805b63ba49dff68be22... Author: Marc Delisle <marc@infomarc.info> Date: 2014-04-11 (Fri, 11 Apr 2014) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: d542180fb1a81b188a5cb52e6e796718d20af11f https://github.com/phpmyadmin/phpmyadmin/commit/d542180fb1a81b188a5cb52e6e79... Author: Marc Delisle <marc@infomarc.info> Date: 2014-04-11 (Fri, 11 Apr 2014) Changed paths: M libraries/sql.lib.php Log Message: ----------- Remove unneeded test Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 72f0507841e6291773285764dcf760efa7429b09 https://github.com/phpmyadmin/phpmyadmin/commit/72f0507841e6291773285764dcf7... Author: Marc Delisle <marc@infomarc.info> Date: 2014-04-11 (Fri, 11 Apr 2014) Changed paths: M libraries/sql.lib.php Log Message: ----------- Merge commit 'f220ef2' Commit: 26e33dd4f252d8cd7932ddaac6408163c0efe914 https://github.com/phpmyadmin/phpmyadmin/commit/26e33dd4f252d8cd7932ddaac640... Author: Marc Delisle <marc@infomarc.info> Date: 2014-04-11 (Fri, 11 Apr 2014) Log Message: ----------- Merge commit '2e5f178' Commit: 212909882408c10e3cbacdea6d2771913c03375e https://github.com/phpmyadmin/phpmyadmin/commit/212909882408c10e3cbacdea6d27... Author: Marc Delisle <marc@infomarc.info> Date: 2014-04-11 (Fri, 11 Apr 2014) Changed paths: M ChangeLog Log Message: ----------- Merge commit '1842f13' Commit: 9a1099eaee16e4d421e40cff8fa74f1640e9fb12 https://github.com/phpmyadmin/phpmyadmin/commit/9a1099eaee16e4d421e40cff8fa7... Author: Marc Delisle <marc@infomarc.info> Date: 2014-04-11 (Fri, 11 Apr 2014) Changed paths: M libraries/sql.lib.php Log Message: ----------- Merge commit 'd542180' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f46865c6604e...9a1099eaee16