Merge mysql-5.1-innodb from bk-internal into my local tree

f664def4 · Vasil Dimov · 09438406 · a426d6f9 · f664def4 · f664def4
Commit f664def4 authored May 20, 2010 by Vasil Dimov
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

storage/innodb_plugin/buf/buf0lru.c storage/innodb_plugin/buf/buf0lru.c +1 -1

storage/innodb_plugin/include/buf0lru.h storage/innodb_plugin/include/buf0lru.h +1 -1

No files found.
--- a/storage/innodb_plugin/buf/buf0lru.c
+++ b/storage/innodb_plugin/buf/buf0lru.c
@@ -1364,7 +1364,7 @@ buf_LRU_make_block_old(
 Try to free a block.  If bpage is a descriptor of a compressed-only
 page, the descriptor object will be freed as well.

-NOTE: If this function returns BUF_LRU_FREED, it will not temporarily
+NOTE: If this function returns BUF_LRU_FREED, it will temporarily
 release buf_pool_mutex.  Furthermore, the page frame will no longer be
 accessible via bpage.


--- a/storage/innodb_plugin/include/buf0lru.h
+++ b/storage/innodb_plugin/include/buf0lru.h
@@ -96,7 +96,7 @@ buf_LRU_insert_zip_clean(
 Try to free a block.  If bpage is a descriptor of a compressed-only
 page, the descriptor object will be freed as well.

-NOTE: If this function returns BUF_LRU_FREED, it will not temporarily
+NOTE: If this function returns BUF_LRU_FREED, it will temporarily
 release buf_pool_mutex.  Furthermore, the page frame will no longer be
 accessible via bpage.