diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-11-05 16:15:20 +0100 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-07 08:52:30 +0100 |
| commit | 3ad37ed0eb343cd173b103974aded5783958a88e (patch) | |
| tree | f4ff854553d26a9e7d57791e7d671d4349a58d2d /scripts | |
| parent | 46f2f24ec43e9c1fa2d994afd615f58736c00d65 (diff) | |
| parent | 0339cbe2f628f8a122ba7ea3a75fc99fa1dc4c96 (diff) | |
| download | mariadb-git-3ad37ed0eb343cd173b103974aded5783958a88e.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_secure_installation.sh | 2 | ||||
| -rw-r--r-- | scripts/mysqlaccess.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mysql_secure_installation.sh b/scripts/mysql_secure_installation.sh index 15a81cc1e8a..b2a9edf4953 100644 --- a/scripts/mysql_secure_installation.sh +++ b/scripts/mysql_secure_installation.sh @@ -440,7 +440,7 @@ if [ "$reply" = "n" ]; then echo " ... skipping." else emptypass=0 - do_query "UPDATE mysql.global_priv SET priv=json_set(priv, '$.plugin', 'mysql_native_password', '$.authentication_string', 'invalid', '$.auth_or', json_array(json_object(), json_object('plugin', 'unix_socket'))) WHERE User='root';" + do_query "UPDATE mysql.global_priv SET priv=json_set(priv, '$.password_last_changed', UNIX_TIMESTAMP(), '$.plugin', 'mysql_native_password', '$.authentication_string', 'invalid', '$.auth_or', json_array(json_object(), json_object('plugin', 'unix_socket'))) WHERE User='root';" if [ $? -eq 0 ]; then echo "Enabled successfully!" echo "Reloading privilege tables.." diff --git a/scripts/mysqlaccess.sh b/scripts/mysqlaccess.sh index c599aa96c57..aaf711b0fb9 100644 --- a/scripts/mysqlaccess.sh +++ b/scripts/mysqlaccess.sh @@ -26,7 +26,7 @@ use Fcntl; BEGIN { # **************************** # static information... - $VERSION = "2.06, 20 Dec 2000"; + $VERSION = "2.10, 13 Sep 2019"; $0 =~ m%/([^/]+)$%o; $script = $1; $script = 'MySQLAccess' unless $script; |