- 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.

mysql-test/include/check_shared_row_lock.inc

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

mysql-test/r/subselect_cache.result

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