summaryrefslogtreecommitdiff
path: root/storage/innobase/include
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/include
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/include')
-rw-r--r--storage/innobase/include/srv0srv.h5
-rw-r--r--storage/innobase/include/univ.i2
2 files changed, 0 insertions, 7 deletions
diff --git a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
index 60b284a46a0..a5bd790b741 100644
--- a/storage/innobase/include/srv0srv.h
+++ b/storage/innobase/include/srv0srv.h
@@ -305,9 +305,6 @@ srv_is_undo_tablespace(ulint space_id)
+ srv_undo_tablespaces_open);
}
-/** The number of undo segments to use */
-extern ulong srv_undo_logs;
-
/** Maximum size of undo tablespace. */
extern unsigned long long srv_max_undo_log_size;
@@ -966,8 +963,6 @@ struct export_var_t{
ulint innodb_system_rows_deleted; /*!< srv_n_system_rows_deleted*/
ulint innodb_num_open_files; /*!< fil_system_t::n_open */
ulint innodb_truncated_status_writes; /*!< srv_truncated_status_writes */
- ulint innodb_available_undo_logs; /*!< srv_available_undo_logs
- */
/** Number of undo tablespace truncation operations */
ulong innodb_undo_truncations;
ulint innodb_defragment_compression_failures; /*!< Number of
diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i
index 31380f09d0f..206dbf56257 100644
--- a/storage/innobase/include/univ.i
+++ b/storage/innobase/include/univ.i
@@ -446,8 +446,6 @@ typedef ib_uint64_t lsn_t;
/** The 'undefined' value for a ulint */
#define ULINT_UNDEFINED ((ulint)(-1))
-#define ULONG_UNDEFINED ((ulong)(-1))
-
/** The 'undefined' value for a ib_uint64_t */
#define UINT64_UNDEFINED ((ib_uint64_t)(-1))