summaryrefslogtreecommitdiff
path: root/storage/innobase/trx/trx0purge.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-05-23 17:34:08 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-05-23 17:34:47 +0300
commit893472d005b6c62209b15b0955af01a55069d8ef (patch)
tree72f257ae8d3d5c380711ac745feaff5e31c74d62 /storage/innobase/trx/trx0purge.cc
parentc83018751cc8eed11279eb6df555bd66c153fa9a (diff)
downloadmariadb-git-893472d005b6c62209b15b0955af01a55069d8ef.tar.gz
MDEV-19570 Deprecate and ignore innodb_undo_logs, remove innodb_rollback_segments
The option innodb_rollback_segments was deprecated already in MariaDB Server 10.0. Its misleadingly named replacement innodb_undo_logs is of very limited use. It makes sense to always create and use the maximum number of rollback segments. Let us remove the deprecated parameter innodb_rollback_segments and deprecate&ignore the parameter innodb_undo_logs (to be removed in a later major release). This work involves some cleanup of InnoDB startup. Similar to other write operations, DROP TABLE will no longer be allowed if innodb_force_recovery is set to a value larger than 3.
Diffstat (limited to 'storage/innobase/trx/trx0purge.cc')
-rw-r--r--storage/innobase/trx/trx0purge.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/trx/trx0purge.cc b/storage/innobase/trx/trx0purge.cc
index eeca6ef9286..7fb1d481126 100644
--- a/storage/innobase/trx/trx0purge.cc
+++ b/storage/innobase/trx/trx0purge.cc
@@ -568,7 +568,7 @@ static void trx_purge_truncate_history()
return;
}
- while (srv_undo_log_truncate && srv_undo_logs >= 3) {
+ while (srv_undo_log_truncate) {
if (!purge_sys.truncate.current) {
const ulint threshold = ulint(srv_max_undo_log_size
>> srv_page_size_shift);