diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-14 16:13:31 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-14 16:13:31 +0200 |
| commit | 6d05a95c652dd0b39dd1337a1514365b58957bf9 (patch) | |
| tree | 77274e16ab5fd5823620d5ac3a49dca6df0559db /sql/upgrade_conf_file.cc | |
| parent | 666565c7f00b0f39bbb459a428efd0093ed05fc8 (diff) | |
| parent | e4205fba7c02b119ceea251f1484730066c2dedc (diff) | |
| download | mariadb-git-6d05a95c652dd0b39dd1337a1514365b58957bf9.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/upgrade_conf_file.cc')
| -rw-r--r-- | sql/upgrade_conf_file.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/upgrade_conf_file.cc b/sql/upgrade_conf_file.cc index 09bd2866798..a30502d0dea 100644 --- a/sql/upgrade_conf_file.cc +++ b/sql/upgrade_conf_file.cc @@ -84,6 +84,7 @@ static const char *removed_variables[] = "innodb_ibuf_accel_rate", "innodb_ibuf_active_contract", "innodb_ibuf_max_size", +"innodb_idle_flush_pct", "innodb_import_table_from_xtrabackup", "innodb_instrument_semaphores", "innodb_kill_idle_transaction", |