diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-05 10:48:03 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-05 10:48:03 +0200 |
| commit | 4e7b382d3132e6be0e597d19d6467a9f58b459a7 (patch) | |
| tree | d4b3816306cfb922de1e593386ecbf38492922ed /storage/innobase/buf | |
| parent | 348ccb6f038a6c108ab9b6a01bdc356cefecd3d4 (diff) | |
| parent | 758af98ff7c47cc1fb5debdc138312fa389d528f (diff) | |
| download | mariadb-git-4e7b382d3132e6be0e597d19d6467a9f58b459a7.tar.gz | |
Merge 10.1 to 10.2
Most conflicts are related to the MDEV-11638 InnoDB shutdown refactoring.
Diffstat (limited to 'storage/innobase/buf')
| -rw-r--r-- | storage/innobase/buf/buf0buf.cc | 6 | ||||
| -rw-r--r-- | storage/innobase/buf/buf0dump.cc | 10 |
2 files changed, 4 insertions, 12 deletions
diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc index 59b3ee4ca7e..eeb851462b5 100644 --- a/storage/innobase/buf/buf0buf.cc +++ b/storage/innobase/buf/buf0buf.cc @@ -3150,18 +3150,14 @@ calc_buf_pool_size: /** This is the thread for resizing buffer pool. It waits for an event and when waked up either performs a resizing and sleeps again. -@param[in] arg a dummy parameter required by os_thread_create. @return this function does not return, calls os_thread_exit() */ extern "C" os_thread_ret_t -DECLARE_THREAD(buf_resize_thread)( - void* arg MY_ATTRIBUTE((unused))) +DECLARE_THREAD(buf_resize_thread)(void*) { my_thread_init(); - srv_buf_resize_thread_active = true; - while (srv_shutdown_state == SRV_SHUTDOWN_NONE) { os_event_wait(srv_buf_resize_event); os_event_reset(srv_buf_resize_event); diff --git a/storage/innobase/buf/buf0dump.cc b/storage/innobase/buf/buf0dump.cc index 682be386f2b..af68fd2af32 100644 --- a/storage/innobase/buf/buf0dump.cc +++ b/storage/innobase/buf/buf0dump.cc @@ -1,6 +1,7 @@ /***************************************************************************** Copyright (c) 2011, 2016, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2017, MariaDB Corporation. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -778,10 +779,7 @@ again. @return this function does not return, it calls os_thread_exit() */ extern "C" os_thread_ret_t -DECLARE_THREAD(buf_dump_thread)( -/*============================*/ - void* arg MY_ATTRIBUTE((unused))) /*!< in: a dummy parameter - required by os_thread_create */ +DECLARE_THREAD(buf_dump_thread)(void*) { ut_ad(!srv_read_only_mode); /* JAN: TODO: MySQL 5.7 PSI @@ -789,8 +787,6 @@ DECLARE_THREAD(buf_dump_thread)( pfs_register_thread(buf_dump_thread_key); #endif */ /* UNIV_PFS_THREAD */ - srv_buf_dump_thread_active = TRUE; - buf_dump_status(STATUS_VERBOSE, "Dumping of buffer pool not started"); buf_load_status(STATUS_VERBOSE, "Loading of buffer pool not started"); @@ -820,7 +816,7 @@ DECLARE_THREAD(buf_dump_thread)( keep going even if we are in a shutdown state */); } - srv_buf_dump_thread_active = FALSE; + srv_buf_dump_thread_active = false; /* We count the number of threads in os_thread_exit(). A created thread should always use that to exit and not use return() to exit. */ |