diff options
author | Sergey Vojtovich <svoj@mariadb.org> | 2016-02-28 14:54:56 +0400 |
---|---|---|
committer | Sergey Vojtovich <svoj@mariadb.org> | 2016-02-28 14:54:56 +0400 |
commit | 0dbfc0fde75f8f6a20f4c9bb527308f87d3114e9 (patch) | |
tree | 5ee7606c4f91547ac15ddbec95879b3af080f8b4 /sql/sql_audit.cc | |
parent | ee5909111dfa77fde2c115d167f45060a454ced5 (diff) | |
download | mariadb-git-0dbfc0fde75f8f6a20f4c9bb527308f87d3114e9.tar.gz |
Yet more fixes covering thread_id type change
Also fixed race condition in main.connect2 test: we need to wait for
disconnected connections to actually decrease Threads_connected.
Diffstat (limited to 'sql/sql_audit.cc')
-rw-r--r-- | sql/sql_audit.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_audit.cc b/sql/sql_audit.cc index b659054a50b..f9793e01ca7 100644 --- a/sql/sql_audit.cc +++ b/sql/sql_audit.cc @@ -95,7 +95,7 @@ static void connection_class_handler(THD *thd, uint event_subclass, va_list ap) mysql_event_connection event; event.event_subclass= event_subclass; event.status= va_arg(ap, int); - event.thread_id= va_arg(ap, unsigned long); + event.thread_id= (unsigned long) va_arg(ap, long long); event.user= va_arg(ap, const char *); event.user_length= va_arg(ap, unsigned int); event.priv_user= va_arg(ap, const char *); |