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

Merge branch '11.2' into 11.4

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-10-30 09:24:04 +01:00
parent 973e641c32 67c0fd2a41
commit c770bce898
734 changed files with 10187 additions and 4442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
sql/handler.h
View File

@ -3212,7 +3212,7 @@ protected:
ha_rows estimation_rows_to_insert;
handler *lookup_handler;
/* Statistics for the query. Updated if handler_stats.in_use is set */
/* Statistics for the query. Updated if handler_stats.active is set */
ha_handler_stats active_handler_stats;
void set_handler_stats();
public:
@ -3464,7 +3464,6 @@ public:
*/
MEM_UNDEFINED(&optimizer_where_cost, sizeof(optimizer_where_cost));
MEM_UNDEFINED(&optimizer_scan_setup_cost, sizeof(optimizer_scan_setup_cost));
active_handler_stats.active= 0;
}
virtual ~handler(void)
{
@ -3486,20 +3485,7 @@ public:
int ha_open(TABLE *table, const char *name, int mode, uint test_if_locked,
MEM_ROOT *mem_root= 0, List<String> *partitions_to_open=NULL);
int ha_index_init(uint idx, bool sorted)
{
DBUG_EXECUTE_IF("ha_index_init_fail", return HA_ERR_TABLE_DEF_CHANGED;);
int result;
DBUG_ENTER("ha_index_init");
DBUG_ASSERT(inited==NONE);
if (!(result= index_init(idx, sorted)))
{
inited= INDEX;
active_index= idx;
end_range= NULL;
}
DBUG_RETURN(result);
}
int ha_index_init(uint idx, bool sorted);
int ha_index_end()
{
DBUG_ENTER("ha_index_end");
@ -5441,6 +5427,12 @@ public:
virtual handlerton *partition_ht() const
{ return ht; }
virtual bool partition_engine() { return 0;}
/*
Used with 'wrapper' engines, like SEQUENCE, to access to the
underlaying engine used for storage.
*/
virtual handlerton *storage_ht() const
{ return ht; }
inline int ha_write_tmp_row(uchar *buf);
inline int ha_delete_tmp_row(uchar *buf);
inline int ha_update_tmp_row(const uchar * old_data, uchar * new_data);
@ -5797,4 +5789,6 @@ inline void Cost_estimate::reset(handler *file)
avg_io_cost= file->DISK_READ_COST * file->DISK_READ_RATIO;
}
int get_select_field_pos(Alter_info *alter_info, int select_field_count,
bool versioned);
#endif /* HANDLER_INCLUDED */