diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-06-11 23:12:48 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-06-12 12:14:14 +0200 |
| commit | 82f3ceed12063ac400a070b9c1972e139c59f385 (patch) | |
| tree | 856b7e5f0b2afc73231311b5b84e698f751fa1f7 /sql/session_tracker.h | |
| parent | 8ec21afc8ed2df3b02815a45624b3287d5ffceae (diff) | |
| download | mariadb-git-82f3ceed12063ac400a070b9c1972e139c59f385.tar.gz | |
MDEV-16470: switch off user variables (and fixes of its support)bb-10.5-MDEV-22550
Diffstat (limited to 'sql/session_tracker.h')
| -rw-r--r-- | sql/session_tracker.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/session_tracker.h b/sql/session_tracker.h index 7db1feb1b1a..c78778ac73c 100644 --- a/sql/session_tracker.h +++ b/sql/session_tracker.h @@ -35,7 +35,9 @@ enum enum_session_tracker CURRENT_SCHEMA_TRACKER, /* Current schema */ SESSION_STATE_CHANGE_TRACKER, TRANSACTION_INFO_TRACKER, /* Transaction state */ +#ifdef USER_VAR_TRACKING USER_VARIABLES_TRACKER, +#endif // USER_VAR_TRACKING SESSION_TRACKER_END /* must be the last */ }; @@ -395,6 +397,7 @@ private: This is a tracker class that enables & manages the tracking of user variables. */ +#ifdef USER_VAR_TRACKING class User_variables_tracker: public State_tracker { Hash_set<const user_var_entry> m_changed_user_variables; @@ -415,6 +418,7 @@ public: } void deinit() { m_changed_user_variables.~Hash_set(); } }; +#endif // USER_VAR_TRACKING /** @@ -445,7 +449,9 @@ public: Session_state_change_tracker state_change; Transaction_state_tracker transaction_info; Session_sysvars_tracker sysvars; +#ifdef USER_VAR_TRACKING User_variables_tracker user_variables; +#endif // USER_VAR_TRACKING Session_tracker() { @@ -453,7 +459,9 @@ public: m_trackers[CURRENT_SCHEMA_TRACKER]= ¤t_schema; m_trackers[SESSION_STATE_CHANGE_TRACKER]= &state_change; m_trackers[TRANSACTION_INFO_TRACKER]= &transaction_info; +#ifdef USER_VAR_TRACKING m_trackers[USER_VARIABLES_TRACKER]= &user_variables; +#endif // USER_VAR_TRACKING } void enable(THD *thd) |