mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fixed innodb_mysql_lock2 test failure because the test did not

Browse source 
anticipate different execution paths resulting in different
  thd->proc_info.
- Fixed subselect_cache to contain correct results. The results
  are currently wrong in 5.3, but are correct in 5.2, and 5.3-mwl89.
This commit is contained in:
unknown 2010-11-19 13:07:55 +02:00
parent de35f1437a
commit b1c6dc6e90
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mysql-test/include/check_shared_row_lock.inc
View file

@ -33,7 +33,8 @@ connection default;
# least it acquires S-locks on some of rows. # least it acquires S-locks on some of rows.
let $wait_condition= let $wait_condition=
select count(*) = 1 from information_schema.processlist select count(*) = 1 from information_schema.processlist
where state in ("Sending data","statistics", "preparing") and where state in ("Sending data","statistics", "preparing", "updating",
"executing", "Searching rows for update") and
info = "$wait_statement"; info = "$wait_statement";
--source include/wait_condition.inc --source include/wait_condition.inc

8
mysql-test/r/subselect_cache.result
View file

@ -897,7 +897,7 @@ a b SUBS
5 6 1 5 6 1
4 5 1 4 5 1
7 8 NULL 7 8 NULL
9 NULL NULL 9 NULL 1
show status like "subquery_cache%"; show status like "subquery_cache%";
Variable_name Value Variable_name Value
Subquery_cache_hit 0 Subquery_cache_hit 0
@ -916,7 +916,7 @@ a b SUBS
5 6 1 5 6 1
4 5 1 4 5 1
7 8 NULL 7 8 NULL
9 NULL NULL 9 NULL 1
show status like "subquery_cache%"; show status like "subquery_cache%";
Variable_name Value Variable_name Value
Subquery_cache_hit 6 Subquery_cache_hit 6
@ -977,7 +977,7 @@ a b SUBS
5 6 0 5 6 0
4 5 0 4 5 0
7 8 NULL 7 8 NULL
9 NULL NULL 9 NULL 0
show status like "subquery_cache%"; show status like "subquery_cache%";
Variable_name Value Variable_name Value
Subquery_cache_hit 0 Subquery_cache_hit 0
@ -996,7 +996,7 @@ a b SUBS
5 6 0 5 6 0
4 5 0 4 5 0
7 8 NULL 7 8 NULL
9 NULL NULL 9 NULL 0
show status like "subquery_cache%"; show status like "subquery_cache%";
Variable_name Value Variable_name Value
Subquery_cache_hit 6 Subquery_cache_hit 6