Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 51bb3591228723ff7c17c1dc3f11de0050315b64 https://github.com/phpmyadmin/phpmyadmin/commit/51bb3591228723ff7c17c1dc3f11... Author: Aswani Prakash aswani15prakash@gmail.com Date: 2018-04-24 (Tue, 24 Apr 2018)

Changed paths: M js/db_multi_table_query.js

Log Message: ----------- #14049 issue fix Query builder doesn't work when the selected column is *

Signed-off-by: Aswani Prakash aswani15prakash@gmail.com (cherry picked from commit 5f3f48446cb0dceee963084a14d5f63a162a89f1) Signed-off-by: Maurício Meneghini Fauth mauriciofauth@gmail.com

Commit: bb8a003cba658bf1cad2f9bea14ee95c44502488 https://github.com/phpmyadmin/phpmyadmin/commit/bb8a003cba658bf1cad2f9bea14e... Author: Maurício Meneghini Fauth mauriciofauth@gmail.com Date: 2018-04-24 (Tue, 24 Apr 2018)

Changed paths: M ChangeLog

Log Message: ----------- Add ChangeLog entry for #14049

Signed-off-by: Maurício Meneghini Fauth mauriciofauth@gmail.com

Commit: d921ab0abb7c2b9989cd54ab8143413cd74ba422 https://github.com/phpmyadmin/phpmyadmin/commit/d921ab0abb7c2b9989cd54ab8143... Author: Maurício Meneghini Fauth mauriciofauth@gmail.com Date: 2018-04-24 (Tue, 24 Apr 2018)

Changed paths: M ChangeLog

Log Message: ----------- Merge branch 'QA_4_8'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/15a3488cb726...d921ab0abb7c