[Commits] Rev 2846: - Fixed innodb_mysql_lock2 test failure because the test did not in file:///home/tsk/mprog/src/5.3-mwl89/

timour at askmonty.org timour at askmonty.org
Fri Nov 19 13:08:03 EET 2010


At file:///home/tsk/mprog/src/5.3-mwl89/

------------------------------------------------------------
revno: 2846
revision-id: timour at askmonty.org-20101119110755-aq6wf04bf8fd2z5i
parent: timour at askmonty.org-20101119105415-h7c235w3guu5zz00
committer: timour at askmonty.org
branch nick: 5.3-mwl89
timestamp: Fri 2010-11-19 13:07:55 +0200
message:
  - Fixed innodb_mysql_lock2 test failure because the test did not
    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.
-------------- next part --------------
=== modified file 'mysql-test/include/check_shared_row_lock.inc'
--- a/mysql-test/include/check_shared_row_lock.inc	2010-05-27 20:07:40 +0000
+++ b/mysql-test/include/check_shared_row_lock.inc	2010-11-19 11:07:55 +0000
@@ -33,7 +33,8 @@ connection default;
 # least it acquires S-locks on some of rows.
 let $wait_condition=
   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";
 --source include/wait_condition.inc
 

=== modified file 'mysql-test/r/subselect_cache.result'
--- a/mysql-test/r/subselect_cache.result	2010-09-14 13:43:41 +0000
+++ b/mysql-test/r/subselect_cache.result	2010-11-19 11:07:55 +0000
@@ -897,7 +897,7 @@ a	b	SUBS
 5       6       1
 4       5       1
 7       8       NULL
-9       NULL    NULL
+9       NULL    1
 show status like "subquery_cache%";
 Variable_name   Value
 Subquery_cache_hit      0
@@ -916,7 +916,7 @@ a	b	SUBS
 5       6       1
 4       5       1
 7       8       NULL
-9       NULL    NULL
+9       NULL    1
 show status like "subquery_cache%";
 Variable_name   Value
 Subquery_cache_hit      6
@@ -977,7 +977,7 @@ a	b	SUBS
 5       6       0
 4       5       0
 7       8       NULL
-9       NULL    NULL
+9       NULL    0
 show status like "subquery_cache%";
 Variable_name   Value
 Subquery_cache_hit      0
@@ -996,7 +996,7 @@ a	b	SUBS
 5       6       0
 4       5       0
 7       8       NULL
-9       NULL    NULL
+9       NULL    0
 show status like "subquery_cache%";
 Variable_name   Value
 Subquery_cache_hit      6



More information about the commits mailing list