bk commit into 5.1 tree (istruewing:1.2556)

[Ingo Struewing]

Below is the list of changes that have just been committed into a local
5.1 repository of istruewing. When istruewing 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, 2007-07-18 20:52:55+02:00, istruewing@stripped +1 -0
  Post-merge fixes
  Fixed debug code of new query cache implementation.

  sql/sql_cache.cc@stripped, 2007-07-18 20:52:50+02:00, istruewing@stripped +10 -2
    Post-merge fixes
    Fixed debug code of new query cache implementation.

diff -Nrup a/sql/sql_cache.cc b/sql/sql_cache.cc
--- a/sql/sql_cache.cc	2007-07-16 20:34:33 +02:00
+++ b/sql/sql_cache.cc	2007-07-18 20:52:50 +02:00
@@ -878,10 +878,14 @@ ulong Query_cache::resize(ulong query_ca
   query_cache_size= query_cache_size_arg;
   ulong new_query_cache_size= init_cache();
 
-  DBUG_EXECUTE("check_querycache",check_integrity(0););
-
   STRUCT_LOCK(&structure_guard_mutex);
   m_cache_status= Query_cache::NO_FLUSH_IN_PROGRESS;
+  /*
+    Must not call check_integrity() with
+    m_cache_status != Query_cache::NO_FLUSH_IN_PROGRESS.
+    It would wait forever.
+  */
+  DBUG_EXECUTE("check_querycache",check_integrity(1););
   pthread_cond_signal(&COND_cache_status_changed);
   STRUCT_UNLOCK(&structure_guard_mutex);
 
@@ -4025,6 +4029,10 @@ my_bool Query_cache::check_integrity(boo
   Query_cache_block * block = first_block;
   do
   {
+    /* When checking at system start, there is no block. */
+    if (!block)
+      break;
+
     DBUG_PRINT("qcache", ("block 0x%lx, type %u...", 
 			  (ulong) block, (uint) block->type));  
     // Check allignment