diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-10-14 13:52:52 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-10-31 16:06:16 +0100 |
| commit | 76151f3cbc0dbba2cda9a44b7b0e7dc1302c3dc4 (patch) | |
| tree | eeacfba7a5dba70f6da3d2c8b666b50a82988c42 /mysql-test/main/create_drop_user.result | |
| parent | 0e388d43a7efe7b68903808fa8bdb521d31aa069 (diff) | |
| download | mariadb-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/create_drop_user.result')
| -rw-r--r-- | mysql-test/main/create_drop_user.result | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/mysql-test/main/create_drop_user.result b/mysql-test/main/create_drop_user.result index dd75d1c257a..67717f3e4e0 100644 --- a/mysql-test/main/create_drop_user.result +++ b/mysql-test/main/create_drop_user.result @@ -1,22 +1,22 @@ CREATE USER IF NOT EXISTS u1@localhost IDENTIFIED BY 'pw1'; -SELECT password FROM mysql.user WHERE user='u1'; -password -*2B602296A79E0A8784ACC5C88D92E46588CCA3C3 +SELECT plugin,authentication_string FROM mysql.user WHERE user='u1'; +plugin authentication_string +mysql_native_password *2B602296A79E0A8784ACC5C88D92E46588CCA3C3 CREATE USER IF NOT EXISTS u1@localhost IDENTIFIED BY 'pw2'; Warnings: Note 1973 Can't create user 'u1'@'localhost'; it already exists -SELECT password FROM mysql.user WHERE user='u1'; -password -*2B602296A79E0A8784ACC5C88D92E46588CCA3C3 +SELECT plugin,authentication_string FROM mysql.user WHERE user='u1'; +plugin authentication_string +mysql_native_password *2B602296A79E0A8784ACC5C88D92E46588CCA3C3 CREATE OR REPLACE USER u1@localhost IDENTIFIED BY 'pw3'; -SELECT password FROM mysql.user WHERE user='u1'; -password -*77B4A70CEFD76DB9415F36D291E74C110D2738E0 +SELECT plugin,authentication_string FROM mysql.user WHERE user='u1'; +plugin authentication_string +mysql_native_password *77B4A70CEFD76DB9415F36D291E74C110D2738E0 CREATE OR REPLACE USER IF NOT EXISTS u1@localhost IDENTIFIED BY 'pw4'; ERROR HY000: Incorrect usage of OR REPLACE and IF NOT EXISTS -SELECT password FROM mysql.user WHERE user='u1'; -password -*77B4A70CEFD76DB9415F36D291E74C110D2738E0 +SELECT plugin,authentication_string FROM mysql.user WHERE user='u1'; +plugin authentication_string +mysql_native_password *77B4A70CEFD76DB9415F36D291E74C110D2738E0 DROP USER IF EXISTS u1@localhost; DROP USER IF EXISTS u1@localhost; Warnings: |