From a2ec51e948a24206c0e27e93d69420f14c160fa0 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Mon, 28 Jan 2019 13:47:53 +0100
Subject: [PATCH] Fix creating users and changing password in MySQL 8 (bug
 #663)

---
 adminer/include/version.inc.php | 2 +-
 adminer/user.inc.php            | 6 +++---
 changes.txt                     | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/adminer/include/version.inc.php b/adminer/include/version.inc.php
index 4c9cd021..0d0af8ac 100644
--- a/adminer/include/version.inc.php
+++ b/adminer/include/version.inc.php
@@ -1,2 +1,2 @@
 <?php
-$VERSION = "4.7.1";
+$VERSION = "4.7.2-dev";
diff --git a/adminer/user.inc.php b/adminer/user.inc.php
index f456c1b6..423db3b3 100644
--- a/adminer/user.inc.php
+++ b/adminer/user.inc.php
@@ -52,7 +52,7 @@ if ($_POST && !$error) {
 	} else {
 		$new_user = q($_POST["user"]) . "@" . q($_POST["host"]); // if $_GET["host"] is not set then $new_user is always different
 		$pass = $_POST["pass"];
-		if ($pass != '' && !$_POST["hashed"]) {
+		if ($pass != '' && !$_POST["hashed"] && !min_version(8)) {
 			// compute hash in a separate query so that plain text password is not saved to history
 			$pass = $connection->result("SELECT PASSWORD(" . q($pass) . ")");
 			$error = !$pass;
@@ -61,7 +61,7 @@ if ($_POST && !$error) {
 		$created = false;
 		if (!$error) {
 			if ($old_user != $new_user) {
-				$created = queries((min_version(5) ? "CREATE USER" : "GRANT USAGE ON *.* TO") . " $new_user IDENTIFIED BY PASSWORD " . q($pass));
+				$created = queries((min_version(5) ? "CREATE USER" : "GRANT USAGE ON *.* TO") . " $new_user IDENTIFIED BY " . (min_version(8) ? "" : "PASSWORD ") . q($pass));
 				$error = !$created;
 			} elseif ($pass != $old_pass) {
 				queries("SET PASSWORD FOR $new_user = " . q($pass));
@@ -136,7 +136,7 @@ if ($_POST) {
 <tr><th><?php echo lang('Username'); ?><td><input name="user" data-maxlength="80" value="<?php echo h($row["user"]); ?>" autocapitalize="off">
 <tr><th><?php echo lang('Password'); ?><td><input name="pass" id="pass" value="<?php echo h($row["pass"]); ?>" autocomplete="new-password">
 <?php if (!$row["hashed"]) { echo script("typePassword(qs('#pass'));"); } ?>
-<?php echo checkbox("hashed", 1, $row["hashed"], lang('Hashed'), "typePassword(this.form['pass'], this.checked);"); ?>
+<?php echo (min_version(8) ? "" : checkbox("hashed", 1, $row["hashed"], lang('Hashed'), "typePassword(this.form['pass'], this.checked);")); ?>
 </table>
 
 <?php
diff --git a/changes.txt b/changes.txt
index e12a493b..81034969 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,3 +1,6 @@
+Adminer 4.7.2-dev:
+MySQL: Fix creating users and changing password in MySQL 8 (bug #663)
+
 Adminer 4.7.1 (released 2019-01-24):
 Display the tables scrollbar (bug #647)
 Remember visible columns in Create Table form (bug #493)