diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-20 11:13:40 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-20 11:13:40 +0300 |
| commit | e380f447421882d8a0700e8821e55e2786b426ad (patch) | |
| tree | 63a1657bc9c9add1233a1c3b7dd41e34110f0236 /storage/innobase | |
| parent | 1893a1370d744408a16548196a6dc62136157399 (diff) | |
| parent | 6b2c8cac1b52bee934ac88cc21c6023f48b69e57 (diff) | |
| download | mariadb-git-e380f447421882d8a0700e8821e55e2786b426ad.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/innobase')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index b917bdab19e..11f6c137b67 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -21050,7 +21050,7 @@ static MYSQL_SYSVAR_UINT(encryption_threads, srv_n_fil_crypt_threads, "scrubbing", NULL, innodb_encryption_threads_update, - srv_n_fil_crypt_threads, 0, UINT_MAX32, 0); + 0, 0, 255, 0); static MYSQL_SYSVAR_UINT(encryption_rotate_key_age, srv_fil_crypt_rotate_key_age, |