diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-10-30 13:02:59 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-10-30 15:10:01 +0100 |
| commit | 44f6f445933e12cbc4cce63e2b7d983b9938d3b9 (patch) | |
| tree | f5230fb24510bb201eb33122a62939ce74588b83 /storage/xtradb/srv | |
| parent | 8772824ce72a811ea92dd5cfb73602eb93237891 (diff) | |
| parent | f4b8b6b9a3ad4ce5e5218e2ec2dfe6dd34112e45 (diff) | |
| download | mariadb-git-44f6f445933e12cbc4cce63e2b7d983b9938d3b9.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'storage/xtradb/srv')
| -rw-r--r-- | storage/xtradb/srv/srv0conc.cc | 1 | ||||
| -rw-r--r-- | storage/xtradb/srv/srv0srv.cc | 1 | ||||
| -rw-r--r-- | storage/xtradb/srv/srv0start.cc | 3 |
3 files changed, 3 insertions, 2 deletions
diff --git a/storage/xtradb/srv/srv0conc.cc b/storage/xtradb/srv/srv0conc.cc index 1d77da63c24..0f8da9516de 100644 --- a/storage/xtradb/srv/srv0conc.cc +++ b/storage/xtradb/srv/srv0conc.cc @@ -285,6 +285,7 @@ srv_conc_enter_innodb_with_atomics( notified_mysql = TRUE; } + DEBUG_SYNC_C("user_thread_waiting"); trx->op_info = "sleeping before entering InnoDB"; sleep_in_us = srv_thread_sleep_delay; diff --git a/storage/xtradb/srv/srv0srv.cc b/storage/xtradb/srv/srv0srv.cc index abdd31333f4..0133b17fada 100644 --- a/storage/xtradb/srv/srv0srv.cc +++ b/storage/xtradb/srv/srv0srv.cc @@ -175,7 +175,6 @@ use simulated aio we build below with threads. Currently we support native aio on windows and linux */ /* make srv_use_native_aio to be visible for other plugins */ my_bool srv_use_native_aio = TRUE; -UNIV_INTERN my_bool srv_numa_interleave = FALSE; /* Default compression level if page compression is used and no compression level is set for the table*/ diff --git a/storage/xtradb/srv/srv0start.cc b/storage/xtradb/srv/srv0start.cc index 4ed310089ac..75b664a0558 100644 --- a/storage/xtradb/srv/srv0start.cc +++ b/storage/xtradb/srv/srv0start.cc @@ -2184,7 +2184,8 @@ innobase_start_or_create_for_mysql() ib_logf(IB_LOG_LEVEL_INFO, "Initializing buffer pool, size = %.1f%c", size, unit); - err = buf_pool_init(srv_buf_pool_size, srv_buf_pool_instances); + err = buf_pool_init(srv_buf_pool_size, static_cast<bool>(srv_numa_interleave), + srv_buf_pool_instances); if (err != DB_SUCCESS) { ib_logf(IB_LOG_LEVEL_ERROR, |