From eeb016bf4df26f6927c1dd233b94f62d94c0e398 Mon Sep 17 00:00:00 2001 From: Michael Zarubin Date: Fri, 2 Dec 2016 17:31:26 +0700 Subject: [PATCH 1/2] Fix #12757 SQL syntax errror on MariaDB < 10.0.2 in check for mysql password check plugin Signed-off-by: Michael Zarubin --- libraries/server_privileges.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index 151ec9eddc..4867ce84ef 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -5241,7 +5241,7 @@ function PMA_getHashedPassword($password) */ function PMA_checkIfMariaDBPwdCheckPluginActive() { - if (Util::getServerType() !== 'MariaDB') { + if (!(Util::getServerType() == 'MariaDB' && PMA_MYSQL_INT_VERSION >= 100002)) { return false; } From 4f29bbd76ae8cb76c8fe1932ae642a5cea48ba38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Sat, 3 Dec 2016 13:44:37 +0100 Subject: [PATCH 2/2] Changelog entry for #12757 and #12777 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 60f94b2f0f..49ad3419c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,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