add Unit test case for import sharp files
add comment for DRIZZLE=false branch
move mock dbi code to setup function
UTs for PMA_server_engines and PMA_server_status
Add missing relations
using a smaller test data to make it run more quick
Add missing default transformations
Merge branch 'QA_4_0'

Conflicts:
	libraries/DisplayResults.class.php
	libraries/information_schema_relations.lib.php
Merge pull request #687 from xmujay/more_UT_for_server

UTs for PMA_server_engines and PMA_server_status
Fix coding style
bug #4090 Downloading BLOB downloads page template
Merge branch 'QA_4_0'
Fix date-second issue with Tracker tests
Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into QA_4_0
bug #4092 Clicking on table name in view of information_schema redirects to wrong page
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Merge branch 'QA_4_0'

Conflicts:
	libraries/special_schema_links.lib.php
Fix failing tests
Merge branch 'QA_4_0'

Conflicts:
	test/classes/PMA_DisplayResults_test.php
Add missing schema link