database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2021-03-19 13:35:18 +02:00
parent dbe941e06f 233c09138f
commit 00528a0445
246 changed files with 5086 additions and 6852 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sql/sql_class.h
View File

@ -1016,11 +1016,24 @@ void add_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var);
void add_diff_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var,
STATUS_VAR *dec_var);
uint calc_sum_of_all_status(STATUS_VAR *to);
static inline void calc_sum_of_all_status_if_needed(STATUS_VAR *to)
{
if (to->local_memory_used == 0)
{
mysql_mutex_lock(&LOCK_status);
*to= global_status_var;
mysql_mutex_unlock(&LOCK_status);
calc_sum_of_all_status(to);
DBUG_ASSERT(to->local_memory_used);
}
}
/*
Update global_memory_used. We have to do this with atomic_add as the
global value can change outside of LOCK_status.
*/
inline void update_global_memory_status(int64 size)
static inline void update_global_memory_status(int64 size)
{
DBUG_PRINT("info", ("global memory_used: %lld size: %lld",
(longlong) global_status_var.global_memory_used,
@ -1038,7 +1051,7 @@ inline void update_global_memory_status(int64 size)
@retval NULL on error
@retval Pointter to CHARSET_INFO with the given name on success
*/
inline CHARSET_INFO *
static inline CHARSET_INFO *
mysqld_collation_get_by_name(const char *name,
CHARSET_INFO *name_cs= system_charset_info)
{
@ -1057,7 +1070,7 @@ mysqld_collation_get_by_name(const char *name,
return cs;
}
inline bool is_supported_parser_charset(CHARSET_INFO *cs)
static inline bool is_supported_parser_charset(CHARSET_INFO *cs)
{
return MY_TEST(cs->mbminlen == 1);
}