bk commit into 5.1 tree (thek:1.2656)

[kpettersson]

Below is the list of changes that have just been committed into a local
5.1 repository of thek. When thek does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-01-11 14:16:46+01:00, thek@adventure.(none) +2 -0
  Fixed faulty test case caused by race condition.

  mysql-test/r/query_cache_debug.result@stripped, 2008-01-11 14:16:44+01:00, thek@adventure.(none) +2 -2
    Fixed faulty test case.

  mysql-test/t/query_cache_debug.test@stripped, 2008-01-11 14:16:44+01:00, thek@adventure.(none) +2 -1
    Fixed faulty test case caused by race condition.

diff -Nrup a/mysql-test/r/query_cache_debug.result b/mysql-test/r/query_cache_debug.result
--- a/mysql-test/r/query_cache_debug.result	2008-01-07 21:06:14 +01:00
+++ b/mysql-test/r/query_cache_debug.result	2008-01-11 14:16:44 +01:00
@@ -11,14 +11,14 @@ On a second connection; clear the query 
 show status like 'Qcache_queries_in_cache';
 Variable_name	Value
 Qcache_queries_in_cache	1
-set global query_cache_size= 0;;
+set global query_cache_size= 0;
 Signal the debug hook to release the lock.
 select id from information_schema.processlist where state='wait_in_query_cache_insert' into @thread_id;
 kill query @thread_id;
 Show query cache status.
 show status like 'Qcache_queries_in_cache';
 Variable_name	Value
-Qcache_queries_in_cache	1
+Qcache_queries_in_cache	0
 set global query_cache_size= 0;
 use test;
 drop table t1;
diff -Nrup a/mysql-test/t/query_cache_debug.test b/mysql-test/t/query_cache_debug.test
--- a/mysql-test/t/query_cache_debug.test	2008-01-07 21:06:14 +01:00
+++ b/mysql-test/t/query_cache_debug.test	2008-01-11 14:16:44 +01:00
@@ -1,3 +1,4 @@
+--source include/not_embedded.inc
 --source include/have_query_cache.inc
 --source include/have_debug.inc
 
@@ -27,7 +28,7 @@ let $wait_condition= select count(*)= 1 
 connection bug30887con2;
 --echo On a second connection; clear the query cache.
 show status like 'Qcache_queries_in_cache';
---send set global query_cache_size= 0;
+set global query_cache_size= 0;
 
 connection default;
 --echo Signal the debug hook to release the lock.