bzr commit into mysql-6.0-bugteam branch (Matthias.Leich:3022)

[Matthias Leich]

#At file:///work2/6.0/mysql-6.0-bugteam-push/

 3022 Matthias Leich	2009-02-05 [merge]
      Merge 5.1 -> 6.0 of fix for
      Bug 42602
modified:
  mysql-test/r/status.result
  mysql-test/t/status.test

=== modified file 'mysql-test/r/status.result'
--- a/mysql-test/r/status.result	2009-01-30 14:13:39 +0000
+++ b/mysql-test/r/status.result	2009-02-05 17:02:57 +0000
@@ -196,7 +196,7 @@ create table db37908.t1(f1 int);
 insert into db37908.t1 values(1);
 grant usage,execute on test.* to mysqltest_1@localhost;
 create procedure proc37908() begin select 1; end |
-create function func37908() returns int sql security invoker 
+create function func37908() returns int sql security invoker
 return (select * from db37908.t1 limit 1)|
 select * from db37908.t1;
 ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 't1'

=== modified file 'mysql-test/t/status.test'
--- a/mysql-test/t/status.test	2009-01-30 14:13:39 +0000
+++ b/mysql-test/t/status.test	2009-02-05 17:02:57 +0000
@@ -4,6 +4,9 @@
 # embedded server causes different stat
 -- source include/not_embedded.inc
 
+# Save the initial number of concurrent sessions
+--source include/count_sessions.inc
+
 # Disable concurrent inserts to avoid sporadic test failures as it might
 # affect the the value of variables used throughout the test case.
 set @old_concurrent_insert= @@global.concurrent_insert;
@@ -88,7 +91,7 @@ show status like 'last_query_cost';
 drop table t1;
 
 #
-# Test for Bug #15933 max_used_connections is wrong after FLUSH STATUS
+# Test for Bug#15933 max_used_connections is wrong after FLUSH STATUS
 # if connections are cached
 #
 #
@@ -188,7 +191,7 @@ disconnect con1;
 
 
 #
-# Bug #30377: EXPLAIN loses last_query_cost when used with UNION
+# Bug#30377 EXPLAIN loses last_query_cost when used with UNION
 #
 
 CREATE TABLE t1 ( a INT );
@@ -241,7 +244,7 @@ eval select substring_index('$rnd_next2'
 disconnect con1;
 connection default;
 
-# 
+#
 # Bug#30252 Com_create_function is not incremented.
 #
 flush status;
@@ -260,7 +263,7 @@ drop function f1;
 show status like 'Com%function';
 
 #
-# Bug#37908: Skipped access right check caused server crash.
+# Bug#37908 Skipped access right check caused server crash.
 #
 connect (root, localhost, root,,test);
 connection root;
@@ -272,20 +275,20 @@ insert into db37908.t1 values(1);
 grant usage,execute on test.* to mysqltest_1@localhost;
 delimiter |;
 create procedure proc37908() begin select 1; end |
-create function func37908() returns int sql security invoker 
+create function func37908() returns int sql security invoker
   return (select * from db37908.t1 limit 1)|
 delimiter ;|
-  
+
 connect (user1,localhost,mysqltest_1,,test);
 connection user1;
 
---error 1142
+--error ER_TABLEACCESS_DENIED_ERROR
 select * from db37908.t1;
---error 1142
+--error ER_TABLEACCESS_DENIED_ERROR
 show status where variable_name ='uptime' and 2 in (select * from db37908.t1);
---error 1142
+--error ER_TABLEACCESS_DENIED_ERROR
 show procedure status where name ='proc37908' and 1 in (select f1 from db37908.t1);
---error 1142
+--error ER_TABLEACCESS_DENIED_ERROR
 show function status where name ='func37908' and 1 in (select func37908());
 
 connection default;
@@ -296,6 +299,8 @@ drop procedure proc37908;
 drop function func37908;
 REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost;
 DROP USER mysqltest_1@localhost;
+# Wait till we reached the initial number of concurrent sessions
+--source include/wait_until_count_sessions.inc
 
 #
 # Bug#41131 "Questions" fails to increment - ignores statements instead stored procs
@@ -336,7 +341,7 @@ DROP FUNCTION f1;
 # End of 5.1 tests
 
 #
-# Bug #17954: Threads_connected > Threads_created
+# Bug#17954 Threads_connected > Threads_created
 #
 
 --disable_warnings
@@ -351,7 +356,7 @@ SELECT NAME FROM v1 WHERE NAME = 'Thread
 DROP VIEW v1;
 
 #
-# Bug#39916: pool-of-threads fails to increment the number of created threads
+# Bug#39916 pool-of-threads fails to increment the number of created threads
 #
 
 SELECT VARIABLE_NAME FROM INFORMATION_SCHEMA.GLOBAL_STATUS
@@ -362,3 +367,7 @@ SELECT VARIABLE_NAME FROM INFORMATION_SC
 # Restore global concurrent_insert value. Keep in the end of the test file.
 --connection default
 set @@global.concurrent_insert= @old_concurrent_insert;
+
+# Wait till we reached the initial number of concurrent sessions
+--source include/wait_until_count_sessions.inc
+