diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-02-19 17:50:30 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-05-07 10:54:56 +0200 |
| commit | 0253ea7f2208354b187ffcfa2f3128878597cc11 (patch) | |
| tree | 6d27f3ebe123eef56bd16b7e6691db7f7bfcfd59 /mysql-test/main/mysql_upgrade-6984.result | |
| parent | 2c3c851d2cba73825f81cd06220138b15c17ae4d (diff) | |
| download | mariadb-git-0253ea7f2208354b187ffcfa2f3128878597cc11.tar.gz | |
MDEV-19650: Privilege bug on MariaDB 10.4
Also fixes:
MDEV-21487: Implement option for mysql_upgrade that allows root@localhost to be replaced
MDEV-21486: Implement option for mysql_install_db that allows root@localhost to be replaced
Add user mariadb.sys to be definer of user view
(and has right on underlying table global_priv for
required operation over global_priv
(SELECT,UPDATE,DELETE))
Also changed definer of gis functions in case of creation,
but they work with any definer so upgrade script do not try
to push this change.
Diffstat (limited to 'mysql-test/main/mysql_upgrade-6984.result')
| -rw-r--r-- | mysql-test/main/mysql_upgrade-6984.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/mysql_upgrade-6984.result b/mysql-test/main/mysql_upgrade-6984.result index ad48004a2a3..120f7cf733c 100644 --- a/mysql-test/main/mysql_upgrade-6984.result +++ b/mysql-test/main/mysql_upgrade-6984.result @@ -1,4 +1,4 @@ -update mysql.global_priv set priv=json_set(priv, '$.plugin', 'mysql_native_password', '$.authentication_string', password('foo')); +update mysql.global_priv set priv=json_set(priv, '$.plugin', 'mysql_native_password', '$.authentication_string', password('foo')) where user='root'; Phase 1/7: Checking and upgrading mysql database Processing databases mysql @@ -63,6 +63,6 @@ test Phase 7/7: Running 'FLUSH PRIVILEGES' OK connect con1,localhost,root,foo,,,; -update mysql.global_priv set priv=json_compact(json_remove(priv, '$.plugin', '$.authentication_string')); +update mysql.global_priv set priv=json_compact(json_remove(priv, '$.plugin', '$.authentication_string')) where user='root'; flush privileges; set global event_scheduler=OFF; |