summaryrefslogtreecommitdiff
path: root/mysql-test/t/grant.test
diff options
context:
space:
mode:
authorMatthias Leich <Matthias.Leich@sun.com>2009-02-09 21:52:40 +0100
committerMatthias Leich <Matthias.Leich@sun.com>2009-02-09 21:52:40 +0100
commit0fab1a857c12239e8c75e409f2a0c3ba4d021535 (patch)
tree6787cc5f23b07d0ef6f17c5794a0065f093b95bc /mysql-test/t/grant.test
parent4c0dd2a7b346604ca57ea5871bc04298f174561c (diff)
downloadmariadb-git-0fab1a857c12239e8c75e409f2a0c3ba4d021535.tar.gz
This belongs to the fix for
Bug#42003 tests missing the disconnect of connections <> default second slice Content: 1. wait_until_count_sessions.inc - One PB run of a test using this routine failed because 5 seconds timeout were exceeded. Although I have some doubts if the assigned timeout was really too small, I increase the value to 10. We waste the additional 5 seconds only if the tests fails anyway. - Print the content of the PROCESSLIST if the poll routine fails 2. minor improvements of formatting 3. query_cache_notembedded: Activate the wait_until_count_sessions.inc routine which was unfortunately forgotten in the changeset before.
Diffstat (limited to 'mysql-test/t/grant.test')
-rw-r--r--mysql-test/t/grant.test5
1 files changed, 2 insertions, 3 deletions
diff --git a/mysql-test/t/grant.test b/mysql-test/t/grant.test
index 6f6e8753004..1b2b8465c83 100644
--- a/mysql-test/t/grant.test
+++ b/mysql-test/t/grant.test
@@ -204,7 +204,7 @@ show grants for mysqltest_1@localhost;
drop user mysqltest_1@localhost;
#
-# Bug#3403 Wrong encoding in SHOW GRANTS, EPLAIN SELECT output
+# Bug#3403 Wrong encoding in SHOW GRANTS, EXPLAIN SELECT output
#
SET NAMES koi8r;
CREATE DATABASE ÂÄ;
@@ -384,7 +384,7 @@ update mysqltest_1.t1, mysqltest_1.t2 set a=100,b=200;
update mysqltest_2.t1, mysqltest_1.t2 set c=100,b=200;
--error ER_TABLEACCESS_DENIED_ERROR
update mysqltest_1.t1, mysqltest_2.t2 set a=100,d=200;
-#lets see the result
+# lets see the result
connection master;
select t1.*,t2.* from mysqltest_1.t1,mysqltest_1.t2;
select t1.*,t2.* from mysqltest_2.t1,mysqltest_2.t2;
@@ -784,7 +784,6 @@ SHOW CREATE VIEW mysqltest2.v_yy;
# succeed, have SELECT and SHOW VIEW
SHOW CREATE TABLE mysqltest2.v_yy;
-
# clean-up
connection master;