database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

This belongs to the fix for

Browse Source 
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.
This commit is contained in:
Matthias Leich
2009-02-09 21:52:40 +01:00
parent 4c0dd2a7b3
commit 0fab1a857c
7 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/include/wait_until_count_sessions.inc
View File

@ -82,7 +82,7 @@
# Created: 2009-01-14 mleich # Created: 2009-01-14 mleich
# #
let $wait_counter= 50; let $wait_counter= 100;
if ($wait_timeout) if ($wait_timeout)
{ {
let $wait_counter= `SELECT $wait_timeout * 10`; let $wait_counter= `SELECT $wait_timeout * 10`;
@ -108,5 +108,6 @@ if (!$success)
{ {
--echo # Timeout in wait_until_count_sessions.inc --echo # Timeout in wait_until_count_sessions.inc
--echo # Number of sessions expected: $count_sessions found: $current_sessions --echo # Number of sessions expected: $count_sessions found: $current_sessions
SHOW PROCESSLIST;
} }

2
mysql-test/r/information_schema.result
View File

@ -1027,7 +1027,7 @@ BEGIN
SELECT 'foo' FROM DUAL; SELECT 'foo' FROM DUAL;
END | END |
ERROR 42000: Unknown database 'information_schema' ERROR 42000: Unknown database 'information_schema'
select ROUTINE_NAME from routines; select ROUTINE_NAME from routines;
ROUTINE_NAME ROUTINE_NAME
grant all on information_schema.* to 'user1'@'localhost'; grant all on information_schema.* to 'user1'@'localhost';
ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'

2
mysql-test/r/subselect.result
View File

@ -4407,7 +4407,7 @@ pk a
3 30 3 30
2 20 2 20
DROP TABLE t1,t2; DROP TABLE t1,t2;
CREATE TABLE t1 (s1 char(1)); CREATE TABLE t1 (s1 CHAR(1));
INSERT INTO t1 VALUES ('a'); INSERT INTO t1 VALUES ('a');
SELECT * FROM t1 WHERE _utf8'a' = ANY (SELECT s1 FROM t1); SELECT * FROM t1 WHERE _utf8'a' = ANY (SELECT s1 FROM t1);
s1 s1

5
mysql-test/t/grant.test
View File

@ -204,7 +204,7 @@ show grants for mysqltest_1@localhost;
drop user 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; SET NAMES koi8r;
CREATE DATABASE <20><>; CREATE DATABASE <20><>;
@ -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; update mysqltest_2.t1, mysqltest_1.t2 set c=100,b=200;
--error ER_TABLEACCESS_DENIED_ERROR --error ER_TABLEACCESS_DENIED_ERROR
update mysqltest_1.t1, mysqltest_2.t2 set a=100,d=200; update mysqltest_1.t1, mysqltest_2.t2 set a=100,d=200;
#lets see the result # lets see the result
connection master; connection master;
select t1.*,t2.* from mysqltest_1.t1,mysqltest_1.t2; select t1.*,t2.* from mysqltest_1.t1,mysqltest_1.t2;
select t1.*,t2.* from mysqltest_2.t1,mysqltest_2.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 # succeed, have SELECT and SHOW VIEW
SHOW CREATE TABLE mysqltest2.v_yy; SHOW CREATE TABLE mysqltest2.v_yy;
# clean-up # clean-up
connection master; connection master;

7
mysql-test/t/information_schema.test
View File

@ -676,7 +676,7 @@ drop table t1;
# #
# Bug#12636 SHOW TABLE STATUS with where condition containing a subquery # Bug#12636 SHOW TABLE STATUS with where condition containing a subquery
# over information schema # over information schema
# #
CREATE TABLE t1 (a int); CREATE TABLE t1 (a int);
@ -729,7 +729,7 @@ BEGIN
SELECT 'foo' FROM DUAL; SELECT 'foo' FROM DUAL;
END | END |
delimiter ;| delimiter ;|
select ROUTINE_NAME from routines; select ROUTINE_NAME from routines;
# #
# Bug#10734 Grant of privileges other than 'select' and 'create view' should fail on schema # Bug#10734 Grant of privileges other than 'select' and 'create view' should fail on schema
# #
@ -980,9 +980,6 @@ SELECT COLUMN_NAME, MD5(COLUMN_DEFAULT), LENGTH(COLUMN_DEFAULT), COLUMN_DEFAULT=
DROP TABLE bug23037; DROP TABLE bug23037;
DROP FUNCTION get_value; DROP FUNCTION get_value;
# #
# Bug#22413 EXPLAIN SELECT FROM view with ORDER BY yield server crash # Bug#22413 EXPLAIN SELECT FROM view with ORDER BY yield server crash
# #

2
mysql-test/t/query_cache_notembedded.test
View File

@ -262,4 +262,4 @@ SET GLOBAL query_cache_size= default;
# End of 5.0 tests # End of 5.0 tests
# Wait till we reached the initial number of concurrent sessions # Wait till we reached the initial number of concurrent sessions
#--source include/wait_until_count_sessions.inc --source include/wait_until_count_sessions.inc

20
mysql-test/t/subselect.test
View File

@ -367,7 +367,7 @@ let $wait_condition= SELECT COUNT(*) <> $row_count_before FROM t1;
--source include/wait_condition.inc --source include/wait_condition.inc
select * from t1; select * from t1;
# #
#TODO: should be uncommented after bug 380 fix pushed #TODO: should be uncommented after Bug#380 fix pushed
#INSERT INTO t1 (x) SELECT (SELECT SUM(a)+b FROM t2) from t3; #INSERT INTO t1 (x) SELECT (SELECT SUM(a)+b FROM t2) from t3;
#select * from t1; #select * from t1;
drop table t1, t2, t3; drop table t1, t2, t3;
@ -2031,7 +2031,7 @@ DROP TABLE t1,t2,t3;
# #
# Bug24670 subquery witout tables but with a WHERE clause # Bug#24670 subquery witout tables but with a WHERE clause
# #
CREATE TABLE t1 (a int); CREATE TABLE t1 (a int);
@ -2567,7 +2567,7 @@ DROP TABLE t1;
# #
# Bug#21540 Subqueries with no from and aggregate functions return # Bug#21540 Subqueries with no from and aggregate functions return
# wrong results # wrong results
CREATE TABLE t1 (a INT, b INT); CREATE TABLE t1 (a INT, b INT);
CREATE TABLE t2 (a INT); CREATE TABLE t2 (a INT);
INSERT INTO t2 values (1); INSERT INTO t2 values (1);
@ -3379,7 +3379,7 @@ DROP TABLE t1,t2;
# #
# Bug#20835 (literal string with =any values) # Bug#20835 (literal string with =any values)
# #
CREATE TABLE t1 (s1 char(1)); CREATE TABLE t1 (s1 CHAR(1));
INSERT INTO t1 VALUES ('a'); INSERT INTO t1 VALUES ('a');
SELECT * FROM t1 WHERE _utf8'a' = ANY (SELECT s1 FROM t1); SELECT * FROM t1 WHERE _utf8'a' = ANY (SELECT s1 FROM t1);
DROP TABLE t1; DROP TABLE t1;
@ -3409,13 +3409,13 @@ INSERT INTO t1 (id) VALUES (1);
INSERT INTO t2 (id) VALUES (1); INSERT INTO t2 (id) VALUES (1);
CREATE VIEW v1 AS CREATE VIEW v1 AS
SELECT t2.c AS c FROM t1, t2 SELECT t2.c AS c FROM t1, t2
WHERE t1.id=t2.id AND 1 IN (SELECT id FROM t1) WITH CHECK OPTION; WHERE t1.id=t2.id AND 1 IN (SELECT id FROM t1) WITH CHECK OPTION;
UPDATE v1 SET c=1; UPDATE v1 SET c=1;
CREATE VIEW v2 (a,b) AS CREATE VIEW v2 (a,b) AS
SELECT t2.id, t2.c AS c FROM t1, t2 SELECT t2.id, t2.c AS c FROM t1, t2
WHERE t1.id=t2.id AND 1 IN (SELECT id FROM t1) WITH CHECK OPTION; WHERE t1.id=t2.id AND 1 IN (SELECT id FROM t1) WITH CHECK OPTION;
--error ER_VIEW_CHECK_FAILED --error ER_VIEW_CHECK_FAILED
INSERT INTO v2(a,b) VALUES (2,2); INSERT INTO v2(a,b) VALUES (2,2);
@ -3423,8 +3423,8 @@ INSERT INTO v2(a,b) VALUES (1,2);
SELECT * FROM v1; SELECT * FROM v1;
CREATE VIEW v3 AS CREATE VIEW v3 AS
SELECT t2.c AS c FROM t2 SELECT t2.c AS c FROM t2
WHERE 1 IN (SELECT id FROM t1) WITH CHECK OPTION; WHERE 1 IN (SELECT id FROM t1) WITH CHECK OPTION;
DELETE FROM v3; DELETE FROM v3;