diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-07-20 13:00:31 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-07-24 12:37:50 +0200 |
| commit | b34cafe9d9fb6029d7aa6c5c18ef51c577aa637a (patch) | |
| tree | 1ec97d6d4e27d2bdb26ece4059d7926d2924812b /extra | |
| parent | 1fb71c7831c9d8d216873e48ca106ca38a4e975b (diff) | |
| download | mariadb-git-b34cafe9d9fb6029d7aa6c5c18ef51c577aa637a.tar.gz | |
cleanup: move thread_count to THD_count::value()
because the name was misleading, it counts not threads, but THDs,
and as THD_count is the only way to increment/decrement it, it
could as well be declared inside THD_count.
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index c2f76b50af4..db7f20d2fdd 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -51,7 +51,7 @@ Street, Fifth Floor, Boston, MA 02110-1335 USA #include <my_getopt.h> #include <mysql_com.h> #include <my_default.h> -#include <mysqld.h> +#include <sql_class.h> #include <fcntl.h> #include <string.h> @@ -6199,7 +6199,7 @@ static bool xtrabackup_prepare_func(char** argv) // See innobase_end() and thd_destructor_proxy() while (srv_fast_shutdown == 0 && (trx_sys.any_active_transactions() || - static_cast<uint>(thread_count) > srv_n_purge_threads + 1)) + THD_count::value() > srv_n_purge_threads + 1)) os_thread_sleep(1000); srv_shutdown_bg_undo_sources(); |