MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Matthias Leich Date:January 28 2009 10:54am
Subject:bzr commit into mysql-6.0-bugteam branch (Matthias.Leich:2983) Bug#41147
View as plain text  
#At file:///work2/6.0/mysql-6.0-bugteam-work1/

 2983 Matthias Leich	2009-01-28
      Fix for Bug#41147 main.user_limits test fails with user exceeding the 'max_questions' resource
      + replace error numbers by error names
modified:
  mysql-test/t/user_limits.test

=== modified file 'mysql-test/t/user_limits.test'
--- a/mysql-test/t/user_limits.test	2005-04-04 19:43:58 +0000
+++ b/mysql-test/t/user_limits.test	2009-01-28 10:53:43 +0000
@@ -5,6 +5,23 @@
 # Requires privileges to be enabled
 -- source include/not_embedded.inc
 
+# <-- Start the cut here
+# As long as
+# Bug#42384 thread_handling = pool-of-threads, wrong handling of max_questions
+#           user limit
+# is not fixed this test will fail when the server was started with
+# "pool-of-threads".
+# Please set $fixed_bug_42384 to 1 when checking if the fix for Bug#42384 works.
+# If everything is fine, please remove the lines between the markers.
+let $fixed_bug_42384 = 0;
+let $my_val= query_get_value(show variables like 'thread_handling', Value, 1);
+if (`SELECT $fixed_bug_42384 = 0 AND '$my_val' = 'pool-of-threads'`)
+{
+   --skip Bug#42384 thread_handling = pool-of-threads, wrong handling of max_questions user limit
+   exit;
+}
+# <-- End the cut here
+
 # Prepare play-ground 
 --disable_warnings
 drop table if exists t1;
@@ -27,12 +44,14 @@ flush user_resources;
 connect (mqph, localhost, mysqltest_1,,);
 connection mqph;
 select * from t1;
+# Bug#42384 thread_handling = pool-of-threads, wrong handling of max_questions
+#           user limit
 select * from t1;
---error 1226
+--error ER_USER_LIMIT_REACHED
 select * from t1;
 connect (mqph2, localhost, mysqltest_1,,);
 connection mqph2;
---error 1226
+--error ER_USER_LIMIT_REACHED
 select * from t1;
 # cleanup
 connection default;
@@ -50,12 +69,12 @@ select * from t1;
 select * from t1;
 delete from t1;
 delete from t1;
---error 1226
+--error ER_USER_LIMIT_REACHED
 delete from t1;
 select * from t1;
 connect (muph2, localhost, mysqltest_1,,);
 connection muph2;
---error 1226
+--error ER_USER_LIMIT_REACHED
 delete from t1;
 select * from t1;
 # Cleanup
@@ -74,7 +93,7 @@ connect (mcph2, localhost, mysqltest_1,,
 connection mcph2;
 select * from t1;
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
---error 1226
+--error ER_USER_LIMIT_REACHED
 connect (mcph3, localhost, mysqltest_1,,);
 # Old connection is still ok
 select * from t1;
@@ -83,7 +102,7 @@ select * from t1;
 disconnect mcph1;
 disconnect mcph2;
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
---error 1226
+--error ER_USER_LIMIT_REACHED
 connect (mcph3, localhost, mysqltest_1,,);
 # Cleanup
 connection default;
@@ -101,7 +120,7 @@ connect (muc2, localhost, mysqltest_1,,)
 connection muc2;
 select * from t1;
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
---error 1226
+--error ER_USER_LIMIT_REACHED
 connect (muc3, localhost, mysqltest_1,,);
 # Closing of one of connections should help
 disconnect muc1;
@@ -115,7 +134,7 @@ connect (muc4, localhost, mysqltest_1,,)
 connection muc4;
 select * from t1;
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
---error 1226
+--error ER_USER_LIMIT_REACHED
 connect (muc5, localhost, mysqltest_1,,);
 # Clean up
 connection default;
@@ -154,7 +173,7 @@ connect (muca3, localhost, mysqltest_1,,
 connection muca3;
 select @@session.max_user_connections, @@global.max_user_connections;
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
---error 1226
+--error ER_USER_LIMIT_REACHED
 connect (muca4, localhost, mysqltest_1,,);
 # Cleanup
 connection default;

Thread
bzr commit into mysql-6.0-bugteam branch (Matthias.Leich:2983) Bug#41147Matthias Leich28 Jan