diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-08 21:38:13 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-08 21:38:13 +0300 |
| commit | 9ba0865b875c8b11a3ca26c9ee17635961d18b23 (patch) | |
| tree | 8d33042f9b00bbd5d6894d93607de62649c6c7a2 /storage/innobase/handler | |
| parent | cc492bfd4ff2d15cc5803a7d80f1559ceeb003c1 (diff) | |
| parent | 7362f115543d34b1d3f06e61be9235b30c0abc8a (diff) | |
| download | mariadb-git-9ba0865b875c8b11a3ca26c9ee17635961d18b23.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/handler')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 9562d1d7462..8db3b72cee6 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -4013,12 +4013,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; |