summaryrefslogtreecommitdiff
path: root/storage/innobase/handler
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-04-08 21:58:18 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-04-08 22:00:07 +0300
commitedd1a53a55b940bea66f38dd9f05229879e69736 (patch)
tree3e3cd971a1d1c275cc4cbd97efa1a971f8468e6e /storage/innobase/handler
parent1e7ad5bb1c69dba8c7d721a2cfbbe98c7e900015 (diff)
parent937ec3c48d2068dfb76d47cb409eb19d38677da1 (diff)
downloadmariadb-git-edd1a53a55b940bea66f38dd9f05229879e69736.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/handler')
-rw-r--r--storage/innobase/handler/ha_innodb.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 828773fe761..c4fe6cdd449 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -4017,12 +4017,6 @@ static int innodb_init_params()
innodb_log_checksums = innodb_log_checksums_func_update(
NULL, innodb_log_checksums);
-#ifdef HAVE_LINUX_LARGE_PAGES
- if ((os_use_large_pages = my_use_large_pages)) {
- os_large_page_size = opt_large_page_size;
- }
-#endif
-
row_rollback_on_timeout = (ibool) innobase_rollback_on_timeout;
srv_locks_unsafe_for_binlog = (ibool) innobase_locks_unsafe_for_binlog;