diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-11 09:41:54 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-11 09:41:54 +0200 |
| commit | 5a1a7141870459cf66d8e441b443187f87a10d5d (patch) | |
| tree | a49a388a0879a965ac9e89bc05f52f92d0f306b2 /sql/sql_class.h | |
| parent | df1eefb2ad138846269d40372678af805589700a (diff) | |
| parent | 3b548d3bbf888e7c9e9853cf826e528b5195d8bd (diff) | |
| download | mariadb-git-5a1a7141870459cf66d8e441b443187f87a10d5d.tar.gz | |
Merge 10.2 into 10.3 (except MDEV-17556)
The fix of MDEV-17556 (commit e25623e78a3efde05e30070dc7362f8dc0d8c459
and commit 61a362c9493df63dc588fcb71409537ae56ab9c8) has been
omitted due to conflicts and will have to be applied separately later.
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index a22102394b8..140394fefc1 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -3291,7 +3291,7 @@ public: void update_all_stats(); void update_stats(void); void change_user(void); - void cleanup(void); + void cleanup(bool have_mutex=false); void cleanup_after_query(); void free_connection(); void reset_for_reuse(); |