bzr push into mysql-5.0 branch (marc.alff:2657 to 2658) Bug#37302

[Marc Alff]

 2658 Marc Alff	2008-08-11
      Bug#37302 (missing DBUG_RETURN macro in function "find_key_block" (5.0 only))
      
      Fixed missing DBUG_RETURN in the function find_key_block
modified:
  mysys/mf_keycache.c

 2657 Chad MILLER	2008-08-11 [merge]
      Merge from bugteam 5.0 trunk.
modified:
  sql/sql_cursor.cc
  tests/mysql_client_test.c

=== modified file 'mysys/mf_keycache.c'
--- a/mysys/mf_keycache.c	2008-03-29 15:50:46 +0000
+++ b/mysys/mf_keycache.c	2008-08-11 21:08:12 +0000
@@ -1382,7 +1382,7 @@ restart:
       /* We don't need the page in the cache: we are going to write on disk */
       hash_link->requests--;
       unlink_hash(keycache, hash_link);
-      return 0;
+      DBUG_RETURN(0);
     }
     if (!(block->status & BLOCK_IN_FLUSH))
     {
@@ -1399,7 +1399,7 @@ restart:
         flag (see the code below that handles reading requests).
       */
       free_block(keycache, block);
-      return 0;
+      DBUG_RETURN(0);
     }
     /* Wait intil the page is flushed on disk */
     hash_link->requests--;
@@ -1429,7 +1429,7 @@ restart:
     /* Invalidate page in the block if it has not been done yet */
     if (block->status)
       free_block(keycache, block);
-    return 0;
+    DBUG_RETURN(0);
   }
 
   if (page_status == PAGE_READ &&