diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-14 16:13:31 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-14 16:13:31 +0200 |
| commit | 6d05a95c652dd0b39dd1337a1514365b58957bf9 (patch) | |
| tree | 77274e16ab5fd5823620d5ac3a49dca6df0559db /storage | |
| parent | 666565c7f00b0f39bbb459a428efd0093ed05fc8 (diff) | |
| parent | e4205fba7c02b119ceea251f1484730066c2dedc (diff) | |
| download | mariadb-git-6d05a95c652dd0b39dd1337a1514365b58957bf9.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/columnstore/CMakeLists.txt | 1 | ||||
| m--------- | storage/columnstore/columnstore | 0 | ||||
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 8 | ||||
| -rw-r--r-- | storage/innobase/include/srv0srv.h | 2 | ||||
| -rw-r--r-- | storage/innobase/srv/srv0srv.cc | 3 |
5 files changed, 1 insertions, 13 deletions
diff --git a/storage/columnstore/CMakeLists.txt b/storage/columnstore/CMakeLists.txt index 77ba817c837..6a6d91b18fe 100644 --- a/storage/columnstore/CMakeLists.txt +++ b/storage/columnstore/CMakeLists.txt @@ -27,6 +27,7 @@ CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64") SET(CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/columnstore/build/preInstall_storage_engine.sh PARENT_SCOPE) SET(CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/columnstore/build/postInstall_storage_engine.sh PARENT_SCOPE) SET(CPACK_RPM_columnstore-engine_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/columnstore/build/preUn_storage_engine.sh PARENT_SCOPE) + APPEND_FOR_CPACK(CPACK_RPM_columnstore-engine_PACKAGE_VERSION "") ENDIF() INSTALL_MYSQL_TEST("${CMAKE_CURRENT_SOURCE_DIR}/mysql-test/" "plugin/columnstore") ENDIF() diff --git a/storage/columnstore/columnstore b/storage/columnstore/columnstore -Subproject f6f91f543283e077e3300a987c56b051435d319 +Subproject ea708da6e30fd579c5fb4b6cecb3c06d4649418 diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 764fd64d9fe..f8f0377eb92 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -18198,13 +18198,6 @@ static MYSQL_SYSVAR_ULONG(io_capacity_max, srv_max_io_capacity, SRV_MAX_IO_CAPACITY_DUMMY_DEFAULT, 100, SRV_MAX_IO_CAPACITY_LIMIT, 0); -static MYSQL_SYSVAR_ULONG(idle_flush_pct, - srv_idle_flush_pct, - PLUGIN_VAR_RQCMDARG, - "Up to what percentage of dirty pages should be flushed when innodb " - "finds it has spare resources to do so.", - NULL, NULL, 100, 0, 100, 0); - #ifdef UNIV_DEBUG static MYSQL_SYSVAR_BOOL(background_drop_list_empty, innodb_background_drop_list_empty, @@ -19239,7 +19232,6 @@ static struct st_mysql_sys_var* innobase_system_variables[]= { MYSQL_SYSVAR(instant_alter_column_allowed), MYSQL_SYSVAR(io_capacity), MYSQL_SYSVAR(io_capacity_max), - MYSQL_SYSVAR(idle_flush_pct), MYSQL_SYSVAR(monitor_enable), MYSQL_SYSVAR(monitor_disable), MYSQL_SYSVAR(monitor_reset), diff --git a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h index 325c3af6591..7c9bd6bc5cf 100644 --- a/storage/innobase/include/srv0srv.h +++ b/storage/innobase/include/srv0srv.h @@ -372,8 +372,6 @@ extern double srv_defragment_fill_factor; extern uint srv_defragment_frequency; extern ulonglong srv_defragment_interval; -extern ulong srv_idle_flush_pct; - extern uint srv_change_buffer_max_size; /* Number of IO operations per second the server can do */ diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc index dd17b21831d..a038441f115 100644 --- a/storage/innobase/srv/srv0srv.cc +++ b/storage/innobase/srv/srv0srv.cc @@ -219,9 +219,6 @@ ulong srv_buf_pool_load_pages_abort = LONG_MAX; /** Lock table size in bytes */ ulint srv_lock_table_size = ULINT_MAX; -/** innodb_idle_flush_pct */ -ulong srv_idle_flush_pct; - /** innodb_read_io_threads */ uint srv_n_read_io_threads; /** innodb_write_io_threads */ |