diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-19 13:06:31 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-19 13:09:21 +0200 |
| commit | be881ec4572b1cecd497436c5db471a83b6ae728 (patch) | |
| tree | 966fef6744a55d6b0decd0ccee14d89774734c07 /storage/innobase/include | |
| parent | 190a8312f598fc4892331225104297f6288f23ac (diff) | |
| parent | 550cf13eb3e8a25826a0fa67935fc28ee7adb0c8 (diff) | |
| download | mariadb-git-be881ec4572b1cecd497436c5db471a83b6ae728.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/innobase/include')
| -rw-r--r-- | storage/innobase/include/ha_prototypes.h | 4 | ||||
| -rw-r--r-- | storage/innobase/include/os0file.h | 3 | ||||
| -rw-r--r-- | storage/innobase/include/trx0sys.h | 8 |
3 files changed, 11 insertions, 4 deletions
diff --git a/storage/innobase/include/ha_prototypes.h b/storage/innobase/include/ha_prototypes.h index 820214de774..559de415b01 100644 --- a/storage/innobase/include/ha_prototypes.h +++ b/storage/innobase/include/ha_prototypes.h @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 2006, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, 2020, MariaDB Corporation. +Copyright (c) 2017, 2021, MariaDB Corporation. 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 @@ -221,7 +221,7 @@ innobase_casedn_str( void wsrep_innobase_kill_one_trx(THD *bf_thd, trx_t *victim_trx, bool signal); ulint wsrep_innobase_mysql_sort(int mysql_type, uint charset_number, unsigned char* str, ulint str_length, - unsigned int buf_length); + ulint buf_length); #endif /* WITH_WSREP */ extern "C" struct charset_info_st *thd_charset(THD *thd); diff --git a/storage/innobase/include/os0file.h b/storage/innobase/include/os0file.h index 3dae92217ec..ad9c2156f76 100644 --- a/storage/innobase/include/os0file.h +++ b/storage/innobase/include/os0file.h @@ -2,7 +2,7 @@ Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2009, Percona Inc. -Copyright (c) 2013, 2020, MariaDB Corporation. +Copyright (c) 2013, 2021, MariaDB Corporation. Portions of this file contain modifications contributed and copyrighted by Percona Inc.. Those modifications are @@ -155,7 +155,6 @@ static const ulint OS_FILE_NORMAL = 62; /** Types for file create @{ */ static const ulint OS_DATA_FILE = 100; static const ulint OS_LOG_FILE = 101; -static const ulint OS_DATA_TEMP_FILE = 102; static const ulint OS_DATA_FILE_NO_O_DIRECT = 103; /* @} */ diff --git a/storage/innobase/include/trx0sys.h b/storage/innobase/include/trx0sys.h index 0cda6b3ddd4..9985932af13 100644 --- a/storage/innobase/include/trx0sys.h +++ b/storage/innobase/include/trx0sys.h @@ -834,6 +834,14 @@ public: mutex_exit(&mutex); } + template <typename Callable> void for_each(Callable &&callback) + { + mutex_enter(&mutex); + for (auto &trx : trx_list) + callback(trx); + mutex_exit(&mutex); + } + void freeze() const { mutex_enter(&mutex); } void unfreeze() const { mutex_exit(&mutex); } |