database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge 10.2 into 10.3 (except MDEV-17556)

Browse Source 
The fix of MDEV-17556 (commit e25623e78a
and commit 61a362c949) has been
omitted due to conflicts and will have to be applied separately later.
This commit is contained in:
Marko Mäkelä
2021-01-11 09:41:54 +02:00
parent df1eefb2ad 3b548d3bbf
commit 5a1a714187
22 changed files with 997 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_class.h
View File

@ -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();