Commit 1e7f961d authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-9451 innodb_buffer_pool_populate does not seem to work on 10.1.10

Instead of interpreting --innodb-buffer-pool-populate as
--innodb-numa-interleave, display warning when the option is set,
saying that the option will be removed in MariaDB 10.2.3.
parent 97b21a19
......@@ -202,6 +202,8 @@ static long innobase_buffer_pool_instances = 1;
static ulong innobase_log_block_size;
static long long innobase_buffer_pool_size, innobase_log_file_size;
/** Deprecated option that has no effect. */
static my_bool innodb_buffer_pool_populate;
/** Percentage of the buffer pool to reserve for 'old' blocks.
Connected to buf_LRU_old_ratio. */
......@@ -4282,6 +4284,15 @@ innobase_init(
"allocator.\n");
}
if (innodb_buffer_pool_populate) {
ut_print_timestamp(stderr);
fprintf(stderr,
" InnoDB: Warning: Setting "
"innodb_buffer_pool_populate is DEPRECATED"
" and has no effect. "
"This option will be removed in MariaDB 10.2.3.\n");
}
srv_n_file_io_threads = (ulint) innobase_file_io_threads;
srv_n_read_io_threads = (ulint) innobase_read_io_threads;
srv_n_write_io_threads = (ulint) innobase_write_io_threads;
......@@ -20758,9 +20769,10 @@ static MYSQL_SYSVAR_LONGLONG(buffer_pool_size, innobase_buffer_pool_size,
"The size of the memory buffer InnoDB uses to cache data and indexes of its tables.",
NULL, NULL, 128*1024*1024L, 5*1024*1024L, LONGLONG_MAX, 1024*1024L);
static MYSQL_SYSVAR_BOOL(buffer_pool_populate, srv_numa_interleave,
static MYSQL_SYSVAR_BOOL(buffer_pool_populate, innodb_buffer_pool_populate,
PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
"Depricated. This option is temporary alias of --innodb-numa-interleave.",
"Deprecated. This option has no effect and "
"will be removed in MariaDB 10.2.3.",
NULL, NULL, FALSE);
static MYSQL_SYSVAR_ENUM(foreground_preflush, srv_foreground_preflush,
......
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