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 branch '10.4' into 10.5

Browse Source
This commit is contained in:
Sujatha
2020-09-29 16:59:36 +05:30
parent 080522dcd7 79e32e47a1
commit 25ede13611
59 changed files with 777 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_class.h
View File

@ -2312,7 +2312,10 @@ public:
rpl_io_thread_info *rpl_io_info;
rpl_sql_thread_info *rpl_sql_info;
} system_thread_info;
/* Used for BACKUP LOCK */
MDL_ticket *mdl_backup_ticket, *mdl_backup_lock;
/* Used to register that thread has a MDL_BACKUP_WAIT_COMMIT lock */
MDL_request *backup_commit_lock;
void reset_for_next_command(bool do_clear_errors= 1);
/*
@ -2759,10 +2762,14 @@ public:
{
free_root(&mem_root,MYF(0));
}
my_bool is_active()
bool is_active()
{
return (all.ha_list != NULL);
}
bool is_empty()
{
return all.is_empty() && stmt.is_empty();
}
st_transactions()
{
bzero((char*)this, sizeof(*this));