summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-04-08 15:36:03 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-04-08 21:33:49 +0300
commitf120a15b93dcb88adc31ad4fc7caf63b813ca63e (patch)
treec71890a6285fd503530471deee099d50005ab604 /extra
parentcaa8c20abee29416c82031a8ae2f7dd23d821b10 (diff)
downloadmariadb-git-f120a15b93dcb88adc31ad4fc7caf63b813ca63e.tar.gz
MDEV-19212 4GB Limit on large_pages - integer overflow
os_mem_alloc_large(): Invoke the macro ut_2pow_round() with the correct argument type. innobase_large_page_size, innobase_use_large_pages, os_use_large_pages, os_large_page_size: Remove. Simply refer to opt_large_page_size, my_use_large_pages.
Diffstat (limited to 'extra')
-rw-r--r--extra/mariabackup/xtrabackup.cc5
1 files changed, 0 insertions, 5 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index 3eca4687bbd..2b8abc04446 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -221,8 +221,6 @@ const char *defaults_group = "mysqld";
#define HA_INNOBASE_ROWS_IN_TABLE 10000 /* to get optimization right */
#define HA_INNOBASE_RANGE_COUNT 100
-ulong innobase_large_page_size = 0;
-
/* The default values for the following, type long or longlong, start-up
parameters are declared in mysqld.cc: */
@@ -247,7 +245,6 @@ affects Windows: */
char* innobase_unix_file_flush_method;
my_bool innobase_use_doublewrite;
-my_bool innobase_use_large_pages;
my_bool innobase_file_per_table;
my_bool innobase_locks_unsafe_for_binlog;
my_bool innobase_rollback_on_timeout;
@@ -1919,8 +1916,6 @@ innodb_init_param(void)
srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
- os_use_large_pages = (ibool) innobase_use_large_pages;
- os_large_page_size = (ulint) innobase_large_page_size;
row_rollback_on_timeout = (ibool) innobase_rollback_on_timeout;
srv_file_per_table = (my_bool) innobase_file_per_table;