diff options
author | Sergei Golubchik <serg@mariadb.org> | 2019-02-18 23:47:08 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2019-02-21 15:04:03 +0100 |
commit | 1e6210161dc3085f9e387416b804e0f2e9e82238 (patch) | |
tree | e43101866874298899c7f72b4125a6668e2aa6b8 /sql/sys_vars.cc | |
parent | 90ad4dbd17a44c64cfaf8cb81588d3f999efd40b (diff) | |
download | mariadb-git-1e6210161dc3085f9e387416b804e0f2e9e82238.tar.gz |
MDEV-7597 Expiration of user passwords
post-merge changes:
* handle password expiration on old tables like everything else -
make changes in memory, even if they cannot be done on disk
* merge "debug" tests with non-debug tests, they don't use dbug anyway
* only run rpl password expiration in MIXED mode, it doesn't replicate
anything, so no need to repeat it thrice
* restore update_user_table_password() prototype, it should not change
ACL_USER, this is done in acl_user_update()
* don't parse json twice in get_password_lifetime and get_password_expired
* remove LEX_USER::is_changing_password, see if there was any auth instead
* avoid overflow in expiration calculations
* don't initialize Account_options in the constructor, it's bzero-ed later
* don't create ulong sysvars - they're not portable, prefer uint or ulonglong
* misc simplifications
Diffstat (limited to 'sql/sys_vars.cc')
-rw-r--r-- | sql/sys_vars.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 595d02c81c9..a05cd1ff629 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -1517,7 +1517,7 @@ static Sys_var_ulong Sys_max_connections( DEFAULT(MAX_CONNECTIONS_DEFAULT), BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_max_connections)); -static Sys_var_ulong Sys_default_password_lifetime( +static Sys_var_uint Sys_default_password_lifetime( "default_password_lifetime", "This defines the global password expiration policy. 0 means " "automatic password expiration is disabled. If the value is a " |