Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8c357fab12b041b1dd67ce8505e7767c4a7a413e https://github.com/phpmyadmin/phpmyadmin/commit/8c357fab12b041b1dd67ce8505e7... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-10-13 (Thu, 13 Oct 2016)

Changed paths: M libraries/sql.lib.php

Log Message: ----------- Also unset just_one_table while having subquery or having more than or less than 1 tables selected

Issue #12625

Signed-off-by: Deven Bansod devenbansod.bits@gmail.com

Commit: 4f3b22b00a39e19c926b4b0f055187841cd64a0a https://github.com/phpmyadmin/phpmyadmin/commit/4f3b22b00a39e19c926b4b0f0551... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-10-13 (Thu, 13 Oct 2016)

Changed paths: M libraries/sql.lib.php

Log Message: ----------- Merge branch 'QA_4_6'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/39960462548a...4f3b22b00a39