diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
| commit | a2a2e32c02643a0cec111511220227703fda1cd5 (patch) | |
| tree | 69cc2b631234c2a8e026b9cd4d72676c61c594df /sql/session_tracker.h | |
| parent | Releasing progress-linux version 1:10.11.8-1~progress7.99u1. (diff) | |
| download | mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.tar.xz mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.zip | |
Merging upstream version 1:11.4.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'sql/session_tracker.h')
| -rw-r--r-- | sql/session_tracker.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/sql/session_tracker.h b/sql/session_tracker.h index 5715b583..690bbc82 100644 --- a/sql/session_tracker.h +++ b/sql/session_tracker.h @@ -154,14 +154,7 @@ class Session_sysvars_tracker: public State_tracker my_hash_free(&m_registered_sysvars); } - sysvar_node_st *search(const sys_var *svar) - { - return reinterpret_cast<sysvar_node_st*>( - my_hash_search(&m_registered_sysvars, - reinterpret_cast<const uchar*>(&svar), - sizeof(sys_var*))); - } - + sysvar_node_st *search(const sys_var *svar); sysvar_node_st *at(ulong i) { DBUG_ASSERT(i < m_registered_sysvars.records); @@ -290,9 +283,9 @@ enum enum_tx_state { Transaction access mode */ enum enum_tx_read_flags { - TX_READ_INHERIT = 0, ///< not explicitly set, inherit session.tx_read_only - TX_READ_ONLY = 1, ///< START TRANSACTION READ ONLY, or tx_read_only=1 - TX_READ_WRITE = 2, ///< START TRANSACTION READ WRITE, or tx_read_only=0 + TX_READ_INHERIT = 0, ///< not explicitly set, inherit session.transaction_read_only + TX_READ_ONLY = 1, ///< START TRANSACTION READ ONLY, or transaction_read_only=1 + TX_READ_WRITE = 2, ///< START TRANSACTION READ WRITE, or transaction_read_only=0 }; @@ -300,7 +293,7 @@ enum enum_tx_read_flags { Transaction isolation level */ enum enum_tx_isol_level { - TX_ISOL_INHERIT = 0, ///< not explicitly set, inherit session.tx_isolation + TX_ISOL_INHERIT = 0, ///< not explicitly set, inherit session.transaction_isolation TX_ISOL_UNCOMMITTED = 1, TX_ISOL_COMMITTED = 2, TX_ISOL_REPEATABLE = 3, |