bk commit into maria tree (bell:1.2611)

[sanja]

Below is the list of changes that have just been committed into a local
maria repository of bell.  When bell 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-03-03 23:29:44+02:00, bell@stripped +1 -0
  Incorrect function prefix fixed. (thanks Guilhem for spotting it)

  storage/maria/ma_pagecache.c@stripped, 2008-03-03 23:29:42+02:00, bell@stripped +4 -4
    Incorrect function prefix fixed.

diff -Nrup a/storage/maria/ma_pagecache.c b/storage/maria/ma_pagecache.c
--- a/storage/maria/ma_pagecache.c	2008-02-26 22:32:02 +02:00
+++ b/storage/maria/ma_pagecache.c	2008-03-03 23:29:42 +02:00
@@ -2217,7 +2217,7 @@ static void info_change_lock(PAGECACHE_B
   @retval 1 Can't lock this block, need retry
 */
 
-static my_bool translog_wait_lock(PAGECACHE *pagecache,
+static my_bool pagecache_wait_lock(PAGECACHE *pagecache,
                                   PAGECACHE_BLOCK_LINK *block,
                                   PAGECACHE_FILE file,
                                   pgcache_page_no_t pageno,
@@ -2226,7 +2226,7 @@ static my_bool translog_wait_lock(PAGECA
   /* Lock failed we will wait */
 #ifdef THREAD
   struct st_my_thread_var *thread= my_thread_var;
-  DBUG_ENTER("translog_wait_lock");
+  DBUG_ENTER("pagecache_wait_lock");
   DBUG_PRINT("info", ("fail to lock, waiting... 0x%lx", (ulong)block));
   thread->lock_type= lock_type;
   wqueue_add_to_queue(&block->wqueue[COND_FOR_WRLOCK], thread);
@@ -2302,7 +2302,7 @@ static my_bool get_wrlock(PAGECACHE *pag
          block->rlocks)
   {
     /* Lock failed we will wait */
-    if (translog_wait_lock(pagecache, block, file, pageno,
+    if (pagecache_wait_lock(pagecache, block, file, pageno,
                            MY_PTHREAD_LOCK_WRITE))
       DBUG_RETURN(1);
   }
@@ -2345,7 +2345,7 @@ static my_bool get_rdlock(PAGECACHE *pag
   while (block->wlocks && !pthread_equal(block->write_locker, locker))
   {
     /* Lock failed we will wait */
-    if (translog_wait_lock(pagecache, block, file, pageno,
+    if (pagecache_wait_lock(pagecache, block, file, pageno,
                            MY_PTHREAD_LOCK_READ))
       DBUG_RETURN(1);
   }