Merge 10.5 into 10.6
This commit is contained in:
commit
32202c30bc
@ -89,9 +89,9 @@ print_where(COND *cond,const char *info, enum_query_type query_type)
|
|||||||
|
|
||||||
#ifdef EXTRA_DEBUG
|
#ifdef EXTRA_DEBUG
|
||||||
/* This is for debugging purposes */
|
/* 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;
|
TABLE *entry;
|
||||||
|
|
||||||
mysql_mutex_lock(&element->LOCK_table_share);
|
mysql_mutex_lock(&element->LOCK_table_share);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user