From 0dbfc0fde75f8f6a20f4c9bb527308f87d3114e9 Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Sun, 28 Feb 2016 14:54:56 +0400 Subject: [PATCH] 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. --- .../sys_vars/r/sysvars_server_embedded,32bit.rdiff | 13 ------------- mysql-test/t/connect2.test | 2 ++ sql/sql_audit.cc | 2 +- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff index 986531a6dd4..59a04978a21 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff @@ -991,19 +991,6 @@ VARIABLE_COMMENT Seconds between sending progress reports to the client for time-consuming statements. Set to 0 to disable progress reporting. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -3053,10 +3053,10 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 0 - VARIABLE_SCOPE SESSION ONLY --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT This variable is for internal server use - NUMERIC_MIN_VALUE 0 --NUMERIC_MAX_VALUE 18446744073709551615 -+NUMERIC_MAX_VALUE 4294967295 - NUMERIC_BLOCK_SIZE 1 - ENUM_VALUE_LIST NULL - READ_ONLY NO @@ -3067,7 +3067,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 16384 diff --git a/mysql-test/t/connect2.test b/mysql-test/t/connect2.test index 7427afaeffd..b0d5c21b1cc 100644 --- a/mysql-test/t/connect2.test +++ b/mysql-test/t/connect2.test @@ -71,6 +71,8 @@ connect(con1,localhost,root,,test,$MASTER_EXTRA_PORT,); connection default; # Check that threads_connected didn't count aborted connections +let $count_sessions= 1; +--source include/wait_until_count_sessions.inc show status like "Threads_connected"; # 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 *);