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 /include | |
| 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 'include')
| -rw-r--r-- | include/mysql.h.pp | 1 | ||||
| -rw-r--r-- | include/mysql_com.h | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/include/mysql.h.pp b/include/mysql.h.pp index 051821c2d37..4e6240a19ac 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -113,7 +113,6 @@ enum enum_session_state_type SESSION_TRACK_GTIDS, SESSION_TRACK_TRANSACTION_CHARACTERISTICS, SESSION_TRACK_TRANSACTION_STATE, - SESSION_TRACK_USER_VARIABLES, SESSION_TRACK_always_at_the_end }; extern "C" { diff --git a/include/mysql_com.h b/include/mysql_com.h index de9eb938f69..fa5960a377b 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -617,7 +617,15 @@ enum enum_session_state_type SESSION_TRACK_GTIDS, SESSION_TRACK_TRANSACTION_CHARACTERISTICS, /* Transaction chistics */ SESSION_TRACK_TRANSACTION_STATE, /* Transaction state */ +#ifdef USER_VAR_TRACKING + SESSION_TRACK_MYSQL_RESERVED1, + SESSION_TRACK_MYSQL_RESERVED2, + SESSION_TRACK_MYSQL_RESERVED3, + SESSION_TRACK_MYSQL_RESERVED4, + SESSION_TRACK_MYSQL_RESERVED5, + SESSION_TRACK_MYSQL_RESERVED6, SESSION_TRACK_USER_VARIABLES, +#endif // USER_VAR_TRACKING SESSION_TRACK_always_at_the_end /* must be last */ }; |