Do not complain about empty password when SHOW GRANTS output does not…

… include the IDENTIFIED BY clause on MySQL 5.7.6+. See http://www.heidisql.com/forum.php?t=21351
HeidiSQL · Jun 6, 2016 · 0ec226c · 0ec226c
1 parent 775c71c
commit 0ec226c
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/source/usermanager.pas b/source/usermanager.pas
@@ -553,16 +553,21 @@ procedure TUserManagerForm.listUsersFocusChanged(Sender: TBaseVirtualTree; Node:
         if (rxGrant.Match[4] = '*') and (rxGrant.Match[6] = '*') then begin
           P.DBObj.NodeType := lntNone;
           P.AllPrivileges := PrivsGlobal;
-          if not FAdded then begin
-            editPassword.TextHint := FConnection.UnescapeString(rxGrant.Match[10]);
-            // Set password for changed user, to silence the error message about invalid length
-            User.Password := editPassword.TextHint;
-          end else begin
-            // Set password for cloned user
-            User.Password := FConnection.UnescapeString(rxGrant.Match[10]);
-            editPassword.Text := User.Password;
-            editRepeatPassword.Text := User.Password;
-            editPassword.Modified := True;
+          // http://dev.mysql.com/doc/refman/5.7/en/show-grants.html
+          // As of MySQL 5.7.6, SHOW GRANTS output does not include IDENTIFIED BY PASSWORD clauses.
+          // Use the SHOW CREATE USER statement instead. See Section 14.7.5.12, "SHOW CREATE USER Syntax".
+          if FConnection.Parameters.IsMySQL and (FConnection.ServerVersionInt < 50706) then begin
+            if not FAdded then begin
+              editPassword.TextHint := FConnection.UnescapeString(rxGrant.Match[10]);
+              // Set password for changed user, to silence the error message about invalid length
+              User.Password := editPassword.TextHint;
+            end else begin
+              // Set password for cloned user
+              User.Password := FConnection.UnescapeString(rxGrant.Match[10]);
+              editPassword.Text := User.Password;
+              editRepeatPassword.Text := User.Password;
+              editPassword.Modified := True;
+            end;
           end;
         end else if (rxGrant.Match[6] = '*') then begin
           P.DBObj.NodeType := lntDb;