diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-03-30 18:27:02 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-03-30 18:27:02 +0300 |
| commit | e895041ba915b4b01f35755d569038abba06d4a7 (patch) | |
| tree | 47c751ffe9409796c80b46e308680eb3ca95d6fb /sql | |
| parent | d2660362920a82588508028f263dad9c16f08865 (diff) | |
| parent | 55f4e4800bc5248921b4896f4b92b816e5e4478c (diff) | |
| download | mariadb-git-e895041ba915b4b01f35755d569038abba06d4a7.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index fe2b9c8d13a..edac9d466f7 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4386,7 +4386,7 @@ static int init_common_variables() DBUG_PRINT("info",("%s Ver %s for %s on %s\n",my_progname, server_version, SYSTEM_TYPE,MACHINE_TYPE)); -#ifdef HAVE_LARGE_PAGES +#ifdef HAVE_LINUX_LARGE_PAGES /* Initialize large page size */ if (opt_large_pages) { @@ -4401,7 +4401,7 @@ static int init_common_variables() else SYSVAR_AUTOSIZE(opt_large_pages, 0); } -#endif /* HAVE_LARGE_PAGES */ +#endif /* HAVE_LINUX_LARGE_PAGES */ #ifdef HAVE_SOLARIS_LARGE_PAGES #define LARGE_PAGESIZE (4*1024*1024) /* 4MB */ #define SUPER_LARGE_PAGESIZE (256*1024*1024) /* 256MB */ |