summaryrefslogtreecommitdiff
path: root/mysql-test/main/grant2.result
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-06-30 16:39:20 +0200
committerSergei Golubchik <serg@mariadb.org>2018-06-30 16:39:20 +0200
commit36e59752e7fc70bc5179a3d730b5ce3ee58e4e30 (patch)
tree0d3e30ce973b2e1f044931c0eb1846d7192becda /mysql-test/main/grant2.result
parent7c0779da7c37f6ef6eff2f79dda6f1b0c57e3869 (diff)
parent1dd3c8f8ba49ec06e550d7376d27ff05ce024bec (diff)
downloadmariadb-git-36e59752e7fc70bc5179a3d730b5ce3ee58e4e30.tar.gz
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main/grant2.result')
-rw-r--r--mysql-test/main/grant2.result8
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/main/grant2.result b/mysql-test/main/grant2.result
index d7e42f9b7aa..ffb41c1b5f8 100644
--- a/mysql-test/main/grant2.result
+++ b/mysql-test/main/grant2.result
@@ -372,8 +372,8 @@ mysqltest_1@127.0.0.1
set password = password('changed');
disconnect b12302;
connection default;
-select host, length(password) from mysql.user where user like 'mysqltest\_1';
-host length(password)
+select host, length(authentication_string) from mysql.user where user like 'mysqltest\_1';
+host length(authentication_string)
127.0.0.1 41
revoke all on mysqltest_1.* from mysqltest_1@'127.0.0.1';
delete from mysql.user where user like 'mysqltest\_1';
@@ -387,8 +387,8 @@ mysqltest_1@127.0.0.0/255.0.0.0
set password = password('changed');
disconnect b12302_2;
connection default;
-select host, length(password) from mysql.user where user like 'mysqltest\_1';
-host length(password)
+select host, length(authentication_string) from mysql.user where user like 'mysqltest\_1';
+host length(authentication_string)
127.0.0.0/255.0.0.0 41
revoke all on mysqltest_1.* from mysqltest_1@'127.0.0.0/255.0.0.0';
delete from mysql.user where user like 'mysqltest\_1';