Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a707ab5616832a48ea3e39a90b824f33173c7980 https://github.com/phpmyadmin/phpmyadmin/commit/a707ab5616832a48ea3e39a90b82... Author: Dan Ungureanu <udan1107@gmail.com> Date: 2015-10-03 (Sat, 03 Oct 2015) Changed paths: M libraries/sql-parser/src/Statements/SelectStatement.php Log Message: ----------- Fixes #11519. Bug while exporting results when a joined table field name is in SELECT query. Signed-off-by: Dan Ungureanu <udan1107@gmail.com> Commit: 88527a0ff0eef42f66d22173d18f7b32307ced90 https://github.com/phpmyadmin/phpmyadmin/commit/88527a0ff0eef42f66d22173d18f... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-10-03 (Sat, 03 Oct 2015) Changed paths: M libraries/sql-parser/src/Statements/SelectStatement.php Log Message: ----------- Merge pull request #11534 from udan11/fix_11519 Fix #11519. Bug while exporting results when a joined table field name is in SELECT query. Commit: 4633d2458f693c1f56fa3693b52bf9025065e2d3 https://github.com/phpmyadmin/phpmyadmin/commit/4633d2458f693c1f56fa3693b52b... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-10-03 (Sat, 03 Oct 2015) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for issue #11519 Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 5eef3a9b604050fac1e4d34be1f50b57e61aaeec https://github.com/phpmyadmin/phpmyadmin/commit/5eef3a9b604050fac1e4d34be1f5... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-10-03 (Sat, 03 Oct 2015) Changed paths: M ChangeLog M libraries/sql-parser/src/Statements/SelectStatement.php Log Message: ----------- Merge branch 'QA_4_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5d2fa0d91ba7...5eef3a9b6040