From 2da1c6bcebb69ee6ff15533c9ee0aa1a4cf8e953 Mon Sep 17 00:00:00 2001 From: Ansgar Becker Date: Mon, 26 Nov 2018 15:53:47 +0100 Subject: [PATCH] Don't wrap new password in PASSWORD() function, on newer MySQL servers. Closes #325. --- source/usermanager.pas | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source/usermanager.pas b/source/usermanager.pas index 411950a7..960782e8 100644 --- a/source/usermanager.pas +++ b/source/usermanager.pas @@ -1298,7 +1298,10 @@ begin // Set password if editPassword.Modified and (not PasswordSet) then begin - FConnection.Query('SET PASSWORD FOR ' + OrgUserHost + ' = PASSWORD('+esc(editPassword.Text)+')'); + if (not FConnection.Parameters.IsMariaDB) and (FConnection.ServerVersionInt >= 50706) then + FConnection.Query('SET PASSWORD FOR ' + OrgUserHost + ' = '+esc(editPassword.Text)) + else + FConnection.Query('SET PASSWORD FOR ' + OrgUserHost + ' = PASSWORD('+esc(editPassword.Text)+')'); end; // Rename user