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

Merge 11.0 into 11.1

Browse Source
This commit is contained in:
Marko Mäkelä
2023-07-26 15:13:43 +03:00
parent 26b96094ec f2b4972bd4
commit c6ac1e39b6
214 changed files with 5163 additions and 2783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sql/ha_partition.cc
View File

@@ -590,6 +590,7 @@ bool ha_partition::initialize_partition(MEM_ROOT *mem_root)
my_error(ER_MIX_HANDLER_ERROR, MYF(0));
DBUG_RETURN(1);
}
file->handler_stats= handler_stats;
} while (*(++file_array));
m_handler_status= handler_initialized;
DBUG_RETURN(0);
@@ -4048,6 +4049,13 @@ int ha_partition::discover_check_version()
return m_file[0]->discover_check_version();
}
static int set_part_handler_stats(handler *h, void *stats)
{
h->handler_stats= (ha_handler_stats*) stats;
return 0;
}
/**
Clone the open and locked partitioning handler.
@@ -4095,6 +4103,9 @@ handler *ha_partition::clone(const char *name, MEM_ROOT *mem_root)
HA_OPEN_IGNORE_IF_LOCKED | HA_OPEN_NO_PSI_CALL))
goto err;
if (handler_stats)
new_handler->loop_partitions(set_part_handler_stats, handler_stats);
DBUG_RETURN((handler*) new_handler);
err:
@@ -4103,6 +4114,16 @@ err:
}
/*
Update all sub partitions to point to handler stats
*/
void ha_partition::handler_stats_updated()
{
loop_partitions(set_part_handler_stats, handler_stats);
}
/*
Close handler object