database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 11.0 into 11.1

Browse Source
This commit is contained in:
Marko Mäkelä
2024-03-28 12:15:36 +02:00
parent d3e4de529b fec2fd6add
commit 683fbced6b
727 changed files with 22650 additions and 8324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sql/handler.h
View File

@ -498,6 +498,12 @@ enum chf_create_flags {
#define HA_LEX_CREATE_SEQUENCE 16U
#define HA_VERSIONED_TABLE 32U
#define HA_SKIP_KEY_SORT 64U
/*
A temporary table that can be used by different threads, eg. replication
threads. This flag ensure that memory is not allocated with THREAD_SPECIFIC,
as we do for other temporary tables.
*/
#define HA_LEX_CREATE_GLOBAL_TMP_TABLE 128U
#define HA_MAX_REC_LENGTH 65535
@ -2691,6 +2697,7 @@ typedef struct st_ha_check_opt
st_ha_check_opt() = default; /* Remove gcc warning */
uint flags; /* isam layer flags (e.g. for myisamchk) */
uint sql_flags; /* sql layer flags - for something myisamchk cannot do */
uint handler_flags; /* Reserved for handler usage */
time_t start_time; /* When check/repair starts */
KEY_CACHE *key_cache; /* new key cache when changing key cache */
void init();
@ -3398,6 +3405,7 @@ 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)
{
@ -4368,7 +4376,6 @@ public:
}
virtual void update_create_info(HA_CREATE_INFO *create_info) {}
int check_old_types();
virtual int assign_to_keycache(THD* thd, HA_CHECK_OPT* check_opt)
{ return HA_ADMIN_NOT_IMPLEMENTED; }
virtual int preload_keys(THD* thd, HA_CHECK_OPT* check_opt)
@ -5062,9 +5069,12 @@ public:
}
inline void ha_handler_stats_disable()
{
handler_stats= 0;
active_handler_stats.active= 0;
handler_stats_updated();
if (handler_stats)
{
handler_stats= 0;
active_handler_stats.active= 0;
handler_stats_updated();
}
}
private:
@ -5078,6 +5088,7 @@ private:
}
}
bool check_old_types() const;
void mark_trx_read_write_internal();
bool check_table_binlog_row_based_internal();