summaryrefslogtreecommitdiff
path: root/mysql-test/main/grant.result
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-10-14 13:52:52 +0200
committerSergei Golubchik <serg@mariadb.org>2018-10-31 16:06:16 +0100
commit76151f3cbc0dbba2cda9a44b7b0e7dc1302c3dc4 (patch)
treeeeacfba7a5dba70f6da3d2c8b666b50a82988c42 /mysql-test/main/grant.result
parent0e388d43a7efe7b68903808fa8bdb521d31aa069 (diff)
downloadmariadb-git-76151f3cbc0dbba2cda9a44b7b0e7dc1302c3dc4.tar.gz
Use mysql.user.authentication_string for password
Don't distinguish between a "password hash" and "authentication string" anymore. Now both are stored in mysql.user.authentication_string, both are handled identically internally. A "password hash" is just how some particular plugins interpret authentication string. Set mysql.user.plugin even if there is no password. The server will use mysql_native_password plugin in these cases, let's make it expicit. Remove LEX_USER::pwhash.
Diffstat (limited to 'mysql-test/main/grant.result')
-rw-r--r--mysql-test/main/grant.result6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/main/grant.result b/mysql-test/main/grant.result
index 93fadbdcdbc..74f86edd4ea 100644
--- a/mysql-test/main/grant.result
+++ b/mysql-test/main/grant.result
@@ -58,7 +58,7 @@ max_questions 0
max_updates 0
max_connections 0
max_user_connections 0
-plugin
+plugin mysql_native_password
authentication_string
password_expired N
is_role N
@@ -134,7 +134,7 @@ max_questions 10
max_updates 0
max_connections 0
max_user_connections 0
-plugin
+plugin mysql_native_password
authentication_string
password_expired N
is_role N
@@ -186,7 +186,7 @@ max_questions 10
max_updates 20
max_connections 30
max_user_connections 0
-plugin
+plugin mysql_native_password
authentication_string
password_expired N
is_role N