diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-06-30 16:39:20 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-06-30 16:39:20 +0200 |
| commit | 36e59752e7fc70bc5179a3d730b5ce3ee58e4e30 (patch) | |
| tree | 0d3e30ce973b2e1f044931c0eb1846d7192becda /mysql-test/main/show_grants_with_plugin-7985.result | |
| parent | 7c0779da7c37f6ef6eff2f79dda6f1b0c57e3869 (diff) | |
| parent | 1dd3c8f8ba49ec06e550d7376d27ff05ce024bec (diff) | |
| download | mariadb-git-36e59752e7fc70bc5179a3d730b5ce3ee58e4e30.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main/show_grants_with_plugin-7985.result')
| -rw-r--r-- | mysql-test/main/show_grants_with_plugin-7985.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/main/show_grants_with_plugin-7985.result b/mysql-test/main/show_grants_with_plugin-7985.result index 81880e5cc40..0f8e1e39969 100644 --- a/mysql-test/main/show_grants_with_plugin-7985.result +++ b/mysql-test/main/show_grants_with_plugin-7985.result @@ -71,7 +71,7 @@ connection default; set password for u1 = PASSWORD('SOMETHINGELSE'); select user, host, password, plugin, authentication_string from mysql.user where user = 'u1'; user host password plugin authentication_string -u1 % *054B7BBD2B9A553DA560520DCD3F76DA2D81B7C6 +u1 % mysql_native_password *054B7BBD2B9A553DA560520DCD3F76DA2D81B7C6 # # Here we should use the password field, as that primes over # the authentication_string field. @@ -112,7 +112,7 @@ connection default; # Now we remove the authentication plugin password, flush privileges and # try again. # -update mysql.user set authentication_string = '' where user='u1'; +update mysql.user set password=authentication_string, plugin='', authentication_string='' where user='u1'; select user, host, password, plugin, authentication_string from mysql.user where user = 'u1'; user host password plugin authentication_string u1 % *054B7BBD2B9A553DA560520DCD3F76DA2D81B7C6 @@ -172,7 +172,7 @@ connection default; set password for u1 = ''; select user, host, password, plugin, authentication_string from mysql.user where user = 'u1'; user host password plugin authentication_string -u1 % +u1 % mysql_native_password # # Test no password connect. # |