Merge remote-tracking branch '56repo/mysql-5.6' into mysql-5.7

Ajo Robert · Ajo Robert · commit 85b63bf26fc2 · 2015-08-19T16:33:29.000+05:30
Because of this change, tests which verifies PROCESSLIST and
then status variable "threads_connected" might fail on slower
machines. As part of this patch, changed test cases to wait
until "threads_connected" is set to expected value instead
of PROCESSLIST count.
diff --git a/mysql-test/r/connect_debug.result b/mysql-test/r/connect_debug.result
@@ -0,0 +1,49 @@
+
+# -- Bug#20201006: Spamming show processlist prevents old connection
+# -- threads from cleaning up.
+SET @saved_max_connections = @@global.max_connections;
+SET GLOBAL max_connections = 2;
+
+# -- Check that we allow only max_connections + 1 connections here
+connect  con_1, localhost, root;
+connect  con_2, localhost, root;
+connect(localhost,root,,test,MYSQL_PORT,MYSQL_SOCK);
+connect  con_3, localhost, root;
+ERROR HY000: Too many connections
+
+# -- Ensure we have max_connections + 1 connections.
+SELECT count(user) FROM information_schema.processlist;
+count(user)
+3
+
+# -- Take LOCK_thd_remove and close one connection then
+# attempt new one [should fail]...
+SET DEBUG_SYNC='inside_do_for_all_thd_copy SIGNAL disconnect_connection WAIT_FOR continue';
+SELECT user FROM INFORMATION_SCHEMA.PROCESSLIST GROUP BY user;;
+connection default;
+SET DEBUG_SYNC='now WAIT_FOR disconnect_connection';
+disconnect con_1;
+connect(localhost,root,,test,MYSQL_PORT,MYSQL_SOCK);
+connect  con_3, localhost, root;
+ERROR HY000: Too many connections
+
+# -- Release the lock. Now new connection should go through
+SET DEBUG_SYNC='now SIGNAL continue';
+connection con_2;
+user
+root
+SET DEBUG_SYNC='RESET';
+
+# -- Waiting for connection to close...
+connect  con_3, localhost, root;
+
+# -- Closing connections...
+disconnect con_3;
+disconnect con_2;
+connection default;
+
+# -- Resetting variables...
+SET GLOBAL max_connections= @saved_max_connections;
+
+# -- End of Bug#20201006.
+
diff --git a/mysql-test/r/server_offline_1.result b/mysql-test/r/server_offline_1.result
@@ -1,7 +1,4 @@
 SET @global_saved_tmp =  @@global.offline_mode;
-SELECT @user_count:=COUNT(USER) FROM INFORMATION_SCHEMA.PROCESSLIST;
-@user_count:=COUNT(USER)
-1
 CREATE USER 'user1'@'localhost';
 CREATE USER 'user2'@'localhost';
 CREATE USER 'user3'@'localhost';
@@ -56,8 +53,6 @@ connect conu1,localhost,user1;
 connect conu2,localhost,user2;
 connect conu3,localhost,user3;
 connection default;
-SELECT @user_count;
-@user_count
 1
 SELECT COUNT(USER) FROM INFORMATION_SCHEMA.PROCESSLIST;
 COUNT(USER)
diff --git a/mysql-test/r/server_offline_2.result b/mysql-test/r/server_offline_2.result
@@ -1,7 +1,6 @@
 SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE variable_name LIKE '%offline_mode%';
 VARIABLE_NAME	VARIABLE_VALUE
 OFFLINE_MODE	OFF
-SET @user_count= 1;
 CREATE USER 'user1'@'localhost';
 CREATE USER 'user2'@'localhost';
 CREATE USER 'user3'@'localhost';
@@ -27,7 +26,6 @@ disconnect conu1;
 ERROR HY000: The server is currently in offline mode
 connect(conu1,localhost,user1)
 connect(root,localhost,root)
-SET @user_count= 1;
 SELECT COUNT(USER) FROM INFORMATION_SCHEMA.PROCESSLIST;
 COUNT(USER)
 1
diff --git a/mysql-test/r/server_offline_3.result b/mysql-test/r/server_offline_3.result
@@ -1,9 +1,6 @@
 SET @global_saved_tmp =  @@global.offline_mode;
 SET @global_autocommit =  @@global.autocommit;
 SET @@global.autocommit= OFF;
-SELECT @user_count:=COUNT(USER) FROM INFORMATION_SCHEMA.PROCESSLIST;
-@user_count:=COUNT(USER)
-1
 CREATE USER 'user1'@'localhost';
 CREATE USER 'user2'@'localhost';
 connect conu1,localhost,user1;
diff --git a/mysql-test/r/server_offline_4.result b/mysql-test/r/server_offline_4.result
@@ -1,7 +1,4 @@
 SET @global_saved_tmp =  @@global.offline_mode;
-SELECT @user_count:=COUNT(USER) FROM INFORMATION_SCHEMA.PROCESSLIST;
-@user_count:=COUNT(USER)
-1
 CREATE USER 'user1'@'localhost';
 connect conu1,localhost,user1;
 use test;
diff --git a/mysql-test/r/server_offline_5.result b/mysql-test/r/server_offline_5.result
@@ -1,7 +1,4 @@
 SET @global_saved_tmp =  @@global.offline_mode;
-SELECT @user_count:=COUNT(USER) FROM INFORMATION_SCHEMA.PROCESSLIST;
-@user_count:=COUNT(USER)
-1
 CREATE USER 'user100'@'localhost';
 CREATE USER 'user99'@'localhost';
 CREATE USER 'user98'@'localhost';
diff --git a/mysql-test/r/server_offline_6.result b/mysql-test/r/server_offline_6.result
@@ -2,9 +2,6 @@ SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE variable_name LIKE '%off
 VARIABLE_NAME	VARIABLE_VALUE
 OFFLINE_MODE	ON
 SET @global_saved_tmp =  @@global.offline_mode;
-SELECT @user_count:=COUNT(USER) FROM INFORMATION_SCHEMA.PROCESSLIST;
-@user_count:=COUNT(USER)
-1
 CREATE USER 'user1'@'localhost';
 SELECT COUNT(USER) FROM INFORMATION_SCHEMA.PROCESSLIST;
 COUNT(USER)
diff --git a/mysql-test/t/connect_debug.test b/mysql-test/t/connect_debug.test
@@ -0,0 +1,78 @@
+
+# This test makes no sense with the embedded server
+--source include/not_embedded.inc
+
+--source include/have_debug_sync.inc
+--source include/have_debug.inc
+
+# Save the initial number of concurrent sessions
+--source include/count_sessions.inc
+
+--echo
+--echo # -- Bug#20201006: Spamming show processlist prevents old connection
+--echo # -- threads from cleaning up.
+
+--enable_connect_log
+SET @saved_max_connections = @@global.max_connections;
+SET GLOBAL max_connections = 2;
+
+--echo
+--echo # -- Check that we allow only max_connections + 1 connections here
+--connect (con_1, localhost, root)
+--connect (con_2, localhost, root)
+--replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
+--error ER_CON_COUNT_ERROR
+--connect (con_3, localhost, root)
+
+--echo
+--echo # -- Ensure we have max_connections + 1 connections.
+SELECT count(user) FROM information_schema.processlist;
+
+--echo
+--echo # -- Take LOCK_thd_remove and close one connection then
+--echo # attempt new one [should fail]...
+SET DEBUG_SYNC='inside_do_for_all_thd_copy SIGNAL disconnect_connection WAIT_FOR continue';
+--SEND SELECT user FROM INFORMATION_SCHEMA.PROCESSLIST GROUP BY user;
+
+--connection default
+SET DEBUG_SYNC='now WAIT_FOR disconnect_connection';
+--disconnect con_1
+
+--replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
+--error ER_CON_COUNT_ERROR
+--connect (con_3, localhost, root)
+
+--echo
+--echo # -- Release the lock. Now new connection should go through
+SET DEBUG_SYNC='now SIGNAL continue';
+--connection con_2
+REAP;
+
+SET DEBUG_SYNC='RESET';
+
+--echo
+--echo # -- Waiting for connection to close...
+let $count_sessions= 2;
+--source include/wait_until_count_sessions.inc
+
+--connect (con_3, localhost, root)
+
+--echo
+--echo # -- Closing connections...
+--disconnect con_3
+--disconnect con_2
+--source include/wait_until_disconnected.inc
+
+--connection default
+--disable_connect_log
+
+--echo
+--echo # -- Resetting variables...
+SET GLOBAL max_connections= @saved_max_connections;
+
+--echo
+--echo # -- End of Bug#20201006.
+--echo
+
+# Wait till all disconnects are completed
+--source include/wait_until_count_sessions.inc
diff --git a/mysql-test/t/server_offline_1.test b/mysql-test/t/server_offline_1.test
@@ -10,7 +10,7 @@ SET @global_saved_tmp =  @@global.offline_mode;
 --enable_connect_log
 # This count may not be 1, because of the probably existing connections
 # from the previous/parallel test runs
-SELECT @user_count:=COUNT(USER) FROM INFORMATION_SCHEMA.PROCESSLIST;
+let $user_count= `SELECT COUNT(USER) FROM INFORMATION_SCHEMA.PROCESSLIST`;
 
 # test case 2.1.1 1)
 # Create 3 non-super users
@@ -33,8 +33,8 @@ SHOW STATUS LIKE 'threads_connected';
 SET GLOBAL offline_mode = ON;
 
 # Wait until all non super user have been disconnected (for slow machines)
-let $wait_condition=SELECT COUNT(USER) = @user_count FROM INFORMATION_SCHEMA.PROCESSLIST;
---source include/wait_condition.inc
+let $count_sessions= $user_count;
+--source include/wait_until_count_sessions.inc
 
 SELECT COUNT(USER) FROM INFORMATION_SCHEMA.PROCESSLIST;
 SHOW STATUS LIKE 'threads_connected';
@@ -70,15 +70,15 @@ SHOW STATUS LIKE 'threads_connected';
 --connect(conu3,localhost,user3)
 
 --connection default
-SELECT @user_count;
+echo $user_count;
 SELECT COUNT(USER) FROM INFORMATION_SCHEMA.PROCESSLIST;
 SHOW STATUS LIKE 'threads_connected';
 
 SET GLOBAL offline_mode = ON;
 
 # Wait until all non super user have been disconnected (for slow machines)
-let $wait_condition=SELECT COUNT(USER) = 1+@user_count FROM INFORMATION_SCHEMA.PROCESSLIST;
---source include/wait_condition.inc
+let $count_sessions= 1 + $user_count;
+--source include/wait_until_count_sessions.inc
 
 SELECT COUNT(USER) FROM INFORMATION_SCHEMA.PROCESSLIST;
 SHOW STATUS LIKE 'threads_connected';
@@ -90,8 +90,8 @@ SHOW STATUS LIKE 'threads_connected';
 --disconnect conu4
 
 # Wait until all users have been disconnected (for slow machines)
-let $wait_condition=SELECT COUNT(USER) = @user_count FROM INFORMATION_SCHEMA.PROCESSLIST;
---source include/wait_condition.inc
+let $count_sessions= $user_count;
+--source include/wait_until_count_sessions.inc
 
 DROP USER 'user1'@'localhost';
 DROP USER 'user2'@'localhost';
diff --git a/mysql-test/t/server_offline_2.test b/mysql-test/t/server_offline_2.test
@@ -15,7 +15,6 @@ let $global_saved_tmp =  `SELECT @@global.offline_mode`;
 # This count may not be 1, because of the probably existing connections
 # from the previous/parallel test runs
 let $user_count= `SELECT COUNT(USER) FROM INFORMATION_SCHEMA.PROCESSLIST`;
---eval SET @user_count= $user_count
 
 # Create 3 non-super users
 
@@ -34,8 +33,8 @@ SHOW STATUS LIKE 'threads_connected';
 SET GLOBAL offline_mode = ON;
 
 # Wait until all non super user have been disconnected (for slow machines)
-let $wait_condition=SELECT COUNT(USER) = @user_count FROM INFORMATION_SCHEMA.PROCESSLIST;
---source include/wait_condition.inc
+let $count_sessions= $user_count;
+--source include/wait_until_count_sessions.inc
 
 SELECT COUNT(USER) FROM INFORMATION_SCHEMA.PROCESSLIST;
 SHOW STATUS LIKE 'threads_connected';
@@ -54,9 +53,8 @@ SHOW STATUS LIKE 'threads_connected';
 --connect(root,localhost,root)
 --echo connect(root,localhost,root)
 # Wait until all non super user have been disconnected (for slow machines)
---eval SET @user_count= $user_count
-let $wait_condition=SELECT COUNT(USER) = @user_count FROM INFORMATION_SCHEMA.PROCESSLIST;
---source include/wait_condition.inc
+let $count_sessions= $user_count;
+--source include/wait_until_count_sessions.inc
 SELECT COUNT(USER) FROM INFORMATION_SCHEMA.PROCESSLIST;
 
 --echo connect(default,localhost,root)
diff --git a/mysql-test/t/server_offline_3.test b/mysql-test/t/server_offline_3.test
@@ -12,7 +12,7 @@ SET @@global.autocommit= OFF;
 --enable_connect_log
 # This count may not be 1, because of the probably existing connections
 # from the previous/parallel test runs
-SELECT @user_count:=COUNT(USER) FROM INFORMATION_SCHEMA.PROCESSLIST;
+let $user_count= `SELECT COUNT(USER) FROM INFORMATION_SCHEMA.PROCESSLIST`;
 
 # test case 2.1.1 3)
 # Create 3 non-super users
@@ -42,8 +42,8 @@ INSERT INTO t1 VALUES (2,'bbbbbbbbbb');
 --connection default
 SET GLOBAL offline_mode = ON;
 # Wait until all non super user have been disconnected (for slow machines)
-let $wait_condition=SELECT COUNT(USER) = @user_count FROM INFORMATION_SCHEMA.PROCESSLIST;
---source include/wait_condition.inc
+let $count_sessions= $user_count;
+--source include/wait_until_count_sessions.inc
 SELECT COUNT(USER) FROM INFORMATION_SCHEMA.PROCESSLIST;
 SET GLOBAL offline_mode = OFF;
 
@@ -61,16 +61,16 @@ DROP TABLE t1;
 --connection default
 SET GLOBAL offline_mode = ON;
 # Wait until all non super user have been disconnected (for slow machines)
-let $wait_condition=SELECT COUNT(USER) = @user_count FROM INFORMATION_SCHEMA.PROCESSLIST;
---source include/wait_condition.inc
+let $count_sessions= $user_count;
+--source include/wait_until_count_sessions.inc
 SELECT COUNT(USER) FROM INFORMATION_SCHEMA.PROCESSLIST;
 
 # Clean up
 --disconnect conu1
 --disconnect conu2
 # Wait until all users have been disconnected (for slow machines)
-let $wait_condition=SELECT COUNT(USER) = @user_count FROM INFORMATION_SCHEMA.PROCESSLIST;
---source include/wait_condition.inc
+let $count_sessions= $user_count;
+--source include/wait_until_count_sessions.inc
 
 DROP USER 'user1'@'localhost';
 DROP USER 'user2'@'localhost';
diff --git a/mysql-test/t/server_offline_4.test b/mysql-test/t/server_offline_4.test
@@ -11,7 +11,7 @@ let $MYSQLD_DATADIR= `SELECT @@global.datadir`;
 --enable_connect_log
 # This count may not be 1, because of the probably existing connections
 # from the previous/parallel test runs
-SELECT @user_count:=COUNT(USER) FROM INFORMATION_SCHEMA.PROCESSLIST;
+let $user_count= `SELECT COUNT(USER) FROM INFORMATION_SCHEMA.PROCESSLIST`;
 
 # test case 2.1.1 3)
 CREATE USER 'user1'@'localhost';
@@ -42,8 +42,8 @@ let $wait_condition=
 # Alter will completely be rolled back (No temp files available)
 SET GLOBAL offline_mode = ON;
 # Wait until all non super user have been disconnected (for slow machines)
-let $wait_condition=SELECT COUNT(USER) = @user_count FROM INFORMATION_SCHEMA.PROCESSLIST;
---source include/wait_condition.inc
+let $count_sessions= $user_count;
+--source include/wait_until_count_sessions.inc
 --list_files $MYSQLD_DATADIR/test t*
 SELECT COUNT(USER) FROM INFORMATION_SCHEMA.PROCESSLIST;
 
@@ -59,15 +59,15 @@ DROP TABLE t2;
 --connection default
 SET GLOBAL offline_mode = ON;
 # Wait until all non super user have been disconnected (for slow machines)
-let $wait_condition=SELECT COUNT(USER) = @user_count FROM INFORMATION_SCHEMA.PROCESSLIST;
---source include/wait_condition.inc
+let $count_sessions= $user_count;
+--source include/wait_until_count_sessions.inc
 SELECT COUNT(USER) FROM INFORMATION_SCHEMA.PROCESSLIST;
 
 # Clean up
 --disconnect conu1
 # Wait until all users have been disconnected (for slow machines)
-let $wait_condition=SELECT COUNT(USER) = @user_count FROM INFORMATION_SCHEMA.PROCESSLIST;
---source include/wait_condition.inc
+let $count_sessions= $user_count;
+--source include/wait_until_count_sessions.inc
 
 DROP USER 'user1'@'localhost';
 
diff --git a/mysql-test/t/server_offline_5.test b/mysql-test/t/server_offline_5.test
diff --git a/mysql-test/t/server_offline_6.test b/mysql-test/t/server_offline_6.test
diff --git a/sql/conn_handler/connection_handler_one_thread.cc b/sql/conn_handler/connection_handler_one_thread.cc
diff --git a/sql/conn_handler/connection_handler_per_thread.cc b/sql/conn_handler/connection_handler_per_thread.cc
