database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +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
#
let $wait_counter= 50;
let $wait_counter= 100;
if ($wait_timeout)
{
let $wait_counter= `SELECT $wait_timeout * 10`;
@ -108,5 +108,6 @@ if (!$success)
{
--echo # Timeout in wait_until_count_sessions.inc
--echo # Number of sessions expected: $count_sessions found: $current_sessions
SHOW PROCESSLIST;
}

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

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

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

@ -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 <20><>;
@ -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;

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

@ -980,9 +980,6 @@ SELECT COLUMN_NAME, MD5(COLUMN_DEFAULT), LENGTH(COLUMN_DEFAULT), COLUMN_DEFAULT=
DROP TABLE bug23037;
DROP FUNCTION get_value;
#
# 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
# Wait till we reached the initial number of concurrent sessions
#--source include/wait_until_count_sessions.inc
--source include/wait_until_count_sessions.inc

6
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
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;
#select * from t1;
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);
@ -3379,7 +3379,7 @@ DROP TABLE t1,t2;
#
# Bug#20835 (literal string with =any values)
#
CREATE TABLE t1 (s1 char(1));
CREATE TABLE t1 (s1 CHAR(1));
INSERT INTO t1 VALUES ('a');
SELECT * FROM t1 WHERE _utf8'a' = ANY (SELECT s1 FROM t1);
DROP TABLE t1;