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 branch '11.8' into 12.0

Browse Source
This commit is contained in:
Oleksandr Byelkin
2025-06-18 07:50:39 +02:00
parent f1102da37a a65f7dc71d
commit dfcb5c91e0
271 changed files with 4921 additions and 1348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/handler.h
View File

@@ -2010,6 +2010,16 @@ public:
DBUG_ASSERT(is_started());
return m_flags & (int) TRX_READ_WRITE;
}
void set_trx_no_rollback()
{
DBUG_ASSERT(is_started());
m_flags|= (int) TRX_NO_ROLLBACK;
}
bool is_trx_no_rollback() const
{
DBUG_ASSERT(is_started());
return m_flags & (int) TRX_NO_ROLLBACK;
}
bool is_started() const { return m_ht != NULL; }
/** Mark this transaction read-write if the argument is read-write. */
void coalesce_trx_with(const Ha_trx_info *stmt_trx)
@@ -2034,7 +2044,7 @@ public:
return m_ht;
}
private:
enum { TRX_READ_ONLY= 0, TRX_READ_WRITE= 1 };
enum { TRX_READ_ONLY= 0, TRX_READ_WRITE= 1, TRX_NO_ROLLBACK= 2 };
/** Auxiliary, used for ha_list management */
Ha_trx_info *m_next;
/**
@@ -5843,7 +5853,7 @@ uint ha_count_rw_all(THD *thd, Ha_trx_info **ptr_ha_info);
bool non_existing_table_error(int error);
uint ha_count_rw_2pc(THD *thd, bool all);
uint ha_check_and_coalesce_trx_read_only(THD *thd, Ha_trx_info *ha_list,
bool all);
bool all, bool *no_rollback);
inline void Cost_estimate::reset(handler *file)
{
reset();