Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 81659dc2cb9d49126e82c266e8b8e8328c1fc45f https://github.com/phpmyadmin/phpmyadmin/commit/81659dc2cb9d49126e82c266e8b8... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-06-23 (Tue, 23 Jun 2015)

Changed paths: M libraries/DatabaseInterface.class.php

Log Message: ----------- Match the old query, so the tests won't complain

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 2abda1c1d3959fb4c6cbc52a4fbcaf6e5f9e4388 https://github.com/phpmyadmin/phpmyadmin/commit/2abda1c1d3959fb4c6cbc52a4fbc... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-06-23 (Tue, 23 Jun 2015)

Changed paths: M config.sample.inc.php M db_designer.php M doc/config.rst M examples/config.manyhosts.inc.php M js/pmd/move.js M libraries/config.default.php M libraries/config/setup.forms.php M libraries/db_designer.lib.php M libraries/relation.lib.php M sql/create_tables.sql M sql/create_tables_drizzle.sql M templates/designer/side_menu.phtml M test/libraries/PMA_relation_cleanup_test.php

Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/bb435183a35d...2abda1c1d395