Merge branch 'QA_4_6'

ChangeLog

@@ -46,6 +46,7 @@ phpMyAdmin - ChangeLog
 - issue #12765 Fixed SQL export with newlines
 - issue #12778 Syntax Error in Adding/Changing TIMESTAMP columns with default value as NULL
 - issue #12769 Edit/Export links are not clickable under Routines tab
+- issue #12757 Fixed creating new user with older MariaDB
 
 4.6.5.1 (2016-11-25)
 - issue #12735 Incorrect parameters to escapeString in Node.php

libraries/server_privileges.lib.php

@@ -5043,7 +5043,7 @@ function PMA_getHashedPassword($password)
  */
 function PMA_checkIfMariaDBPwdCheckPluginActive()
 {
-    if (Util::getServerType() !== 'MariaDB') {
+    if (!(Util::getServerType() == 'MariaDB' && PMA_MYSQL_INT_VERSION >= 100002)) {
         return false;
     }