1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Merge remote-tracking branch 'origin/11.2' into 11.4

This commit is contained in:
Alexander Barkov
2024-06-17 14:53:54 +04:00
252 changed files with 4073 additions and 1032 deletions

View File

@@ -88,9 +88,9 @@ print_where(COND *cond,const char *info, enum_query_type query_type)
#ifdef EXTRA_DEBUG
/* This is for debugging purposes */
static my_bool print_cached_tables_callback(TDC_element *element,
void *arg __attribute__((unused)))
static my_bool print_cached_tables_callback(void *el, void*)
{
TDC_element *element= static_cast<TDC_element*>(el);
TABLE *entry;
mysql_mutex_lock(&element->LOCK_table_share);
@@ -117,7 +117,7 @@ static void print_cached_tables(void)
/* purecov: begin tested */
puts("DB Table Version Thread Open Lock");
tdc_iterate(0, (my_hash_walk_action) print_cached_tables_callback, NULL, true);
tdc_iterate(0, print_cached_tables_callback, NULL, true);
fflush(stdout);
/* purecov: end */