Merge branch 'QA_4_6'

ChangeLog

@@ -25,6 +25,7 @@ phpMyAdmin - ChangeLog
 - issue #12249 Fix cookie path on IIS
 - issue #11705 Fix occassional 200 errors on Windows
 - issue #12219 Fix locking issues when importing SQL
+- issue #12231 Avoid confusing warning when mysql extension is missing
 
 4.6.1 (2016-05-02)
 - issue #12120 PMA_Util not found in insert_edit.lib.php

libraries/database_interface.inc.php

@@ -43,7 +43,7 @@ if (defined('TESTSUITE')) {
             if (! PMA\libraries\DatabaseInterface::checkDbExtension($extension)) {
                 // warn about both extensions missing and exit
                 PMA_warnMissingExtension(
-                    'mysqli|mysql',
+                    'mysqli',
                     true,
                     $doclink
                 );