summaryrefslogtreecommitdiff
path: root/mysql-test/main/grant4.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/grant4.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/grant4.result')
-rw-r--r--mysql-test/main/grant4.result16
1 files changed, 8 insertions, 8 deletions
diff --git a/mysql-test/main/grant4.result b/mysql-test/main/grant4.result
index c3db2e03e3e..735b8260fce 100644
--- a/mysql-test/main/grant4.result
+++ b/mysql-test/main/grant4.result
@@ -199,14 +199,14 @@ grant select on test.* to foo7 identified via mysql_native_password using '11111
grant select on test.* to foo8 identified via mysql_old_password using '2222222222222222';
select user,password,plugin,authentication_string from mysql.user where user like 'foo%';
user password plugin authentication_string
-foo1 11111111111111111111111111111111111111111
-foo2 2222222222222222
-foo3 11111111111111111111111111111111111111111
-foo4 2222222222222222
-foo5 11111111111111111111111111111111111111111
-foo6 2222222222222222
-foo7 11111111111111111111111111111111111111111
-foo8 2222222222222222
+foo1 mysql_native_password 11111111111111111111111111111111111111111
+foo2 mysql_old_password 2222222222222222
+foo3 mysql_native_password 11111111111111111111111111111111111111111
+foo4 mysql_old_password 2222222222222222
+foo5 mysql_native_password 11111111111111111111111111111111111111111
+foo6 mysql_old_password 2222222222222222
+foo7 mysql_native_password 11111111111111111111111111111111111111111
+foo8 mysql_old_password 2222222222222222
drop user foo1;
drop user foo2;
drop user foo3;