Commit e2a932c9 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Post-fixes for MDEV-18851 for Windows

- On Windows, do not handle lack of SeLockMemory privilege as fatal error.
Just like on any other platform, there is a fallback to ordinary pages.
It is better than server that does not start, silently.

- On Windows, remove incorrect  irritating "fallback to conventional pages failed"
from the warning, when allocating large pages fails.
parent 2f7d91bb
......@@ -197,7 +197,6 @@ int my_init_large_pages(my_bool super_large_pages)
"Lock Pages in memory access rights required for use with"
" large-pages, see https://mariadb.com/kb/en/library/"
"mariadb-memory-allocation/#huge-pages", MYF(MY_WME));
return 1;
}
my_large_page_size= GetLargePageMinimum();
#endif
......@@ -291,8 +290,7 @@ uchar *my_large_malloc(size_t *size, myf my_flags)
{
my_printf_error(EE_OUTOFMEMORY,
"Couldn't allocate %zu bytes (MEM_LARGE_PAGES page "
"size %zu); Windows error %lu; fallback to "
"conventional pages failed",
"size %zu); Windows error %lu",
MYF(ME_WARNING | ME_ERROR_LOG_ONLY), *size,
my_large_page_size, GetLastError());
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment