Merge 10.5 into 10.6

32202c30 · Marko Mäkelä · c849952b · dd13243b · 32202c30
Commit 32202c30 authored Jun 13, 2024 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/sql_test.cc sql/sql_test.cc +2 -2

No files found.
--- a/sql/sql_test.cc
+++ b/sql/sql_test.cc
@@ -89,9 +89,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,
+static my_bool print_cached_tables_callback(void *el, void*)
-                                            void *arg __attribute__((unused)))
 {
+  TDC_element *element= static_cast<TDC_element*>(el);
  TABLE *entry;
  mysql_mutex_lock(&element->LOCK_table_share);