bk commit into 5.1 tree (kostja:1.2530)

[konstantin]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja. When kostja 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-14 04:38:21+04:00, kostja@bodhi.(none) +1 -0
  Fix a warning in a non-debug build.

  sql/sql_cache.cc@stripped, 2007-07-14 04:38:19+04:00, kostja@bodhi.(none) +2 -2
    Fix a warning in a non-debug build.

diff -Nrup a/sql/sql_cache.cc b/sql/sql_cache.cc
--- a/sql/sql_cache.cc	2007-07-02 23:03:08 +04:00
+++ b/sql/sql_cache.cc	2007-07-14 04:38:19 +04:00
@@ -793,7 +793,8 @@ void query_cache_end_of_result(THD *thd)
         query_cache.wreck() switched query cache off but left content
         untouched for investigation (it is debugging method).
       */
-      goto end;
+      STRUCT_UNLOCK(&query_cache.structure_guard_mutex);
+      DBUG_VOID_RETURN;
     }
 #endif
     header->found_rows(current_thd->limit_found_rows);
@@ -808,7 +809,6 @@ void query_cache_end_of_result(THD *thd)
 
   }
 
-end:
   STRUCT_UNLOCK(&query_cache.structure_guard_mutex);
   DBUG_VOID_RETURN;
 }