diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2016-08-09 15:49:30 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2016-08-31 17:17:46 +0200 |
| commit | 6dfa1d374e8c4d3a06e25ceb78cc6571418363ab (patch) | |
| tree | e41520848e0ffdefb24a7fbe4cfe1c7249163125 /include | |
| parent | 0ee3e64c55664332e8e92eda55b43692159fe4fe (diff) | |
| download | mariadb-git-6dfa1d374e8c4d3a06e25ceb78cc6571418363ab.tar.gz | |
MDEV-8931: (server part of) session state tracking
Postreview fixes.
New MySQL tests fixes.
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql.h.pp | 2 | ||||
| -rw-r--r-- | include/mysql_com.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/mysql.h.pp b/include/mysql.h.pp index 0ef3403626c..e1a0901cee8 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -95,7 +95,7 @@ enum enum_session_state_type SESSION_TRACK_GTIDS, SESSION_TRACK_TRANSACTION_CHARACTERISTICS, SESSION_TRACK_TRANSACTION_STATE, - SESSION_TRACK_END + SESSION_TRACK_always_at_the_end }; my_bool my_net_init(NET *net, Vio* vio, void *thd, unsigned int my_flags); void my_net_local_init(NET *net); diff --git a/include/mysql_com.h b/include/mysql_com.h index 16af9849759..82f3b9f62ba 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -559,13 +559,13 @@ enum enum_session_state_type SESSION_TRACK_GTIDS, SESSION_TRACK_TRANSACTION_CHARACTERISTICS, /* Transaction chistics */ SESSION_TRACK_TRANSACTION_STATE, /* Transaction state */ - SESSION_TRACK_END /* must be last */ + SESSION_TRACK_always_at_the_end /* must be last */ }; #define SESSION_TRACK_BEGIN SESSION_TRACK_SYSTEM_VARIABLES #define IS_SESSION_STATE_TYPE(T) \ - (((int)(T) >= SESSION_TRACK_BEGIN) && ((T) < SESSION_TRACK_END)) + (((int)(T) >= SESSION_TRACK_BEGIN) && ((T) < SESSION_TRACK_always_at_the_end)) #define net_new_transaction(net) ((net)->pkt_nr=0) |