Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2bd95448787239e66ab87e4f9cd3cb47d603f5dc https://github.com/phpmyadmin/phpmyadmin/commit/2bd95448787239e66ab87e4f9cd3... Author: Chirayu Chiripal chirayu.chiripal@gmail.com Date: 2014-06-12 (Thu, 12 Jun 2014)

Changed paths: M libraries/DatabaseInterface.class.php

Log Message: ----------- bug-4454: PMA_DatabaseInterface::getColumnsFull() when called with no database or table parameter gives incorrectly nested keys

Signed-off-by: Chirayu Chiripal chirayu.chiripal@gmail.com

Commit: 2b8bb91bc3a66e2014ea078a68a0962708609eee https://github.com/phpmyadmin/phpmyadmin/commit/2b8bb91bc3a66e2014ea078a68a0... Author: Michal Čihař michal@cihar.com Date: 2014-06-12 (Thu, 12 Jun 2014)

Changed paths: M libraries/DatabaseInterface.class.php

Log Message: ----------- Merge pull request #1223 from D-storm/bug-4454

bug-4454: PMA_DatabaseInterface::getColumnsFull() when called with no da...

Commit: ddac366fd6e29d3b347adf81997e190a7fe78343 https://github.com/phpmyadmin/phpmyadmin/commit/ddac366fd6e29d3b347adf81997e... Author: Michal Čihař michal@cihar.com Date: 2014-06-12 (Thu, 12 Jun 2014)

Changed paths: M libraries/DatabaseInterface.class.php

Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2'

Conflicts: libraries/DatabaseInterface.class.php

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a7bcbbc35f5e...ddac366fd6e2