Commit 6f5188d7 authored by monty@donna.mysql.fi's avatar monty@donna.mysql.fi

Merge work:/my/mysql into donna.mysql.fi:/home/my/bk/mysql

parents a7998f82 a1e6710b
jani@hynda.mysql.fi
heikki@donna.mysql.fi heikki@donna.mysql.fi
jcole@abel.spaceapes.com
jcole@tetra.spaceapes.com
monty@donna.mysql.fi monty@donna.mysql.fi
monty@tik.mysql.fi
mwagner@evoq.mwagner.org
paul@central.snake.net
sasha@mysql.sashanet.com
sasha@work.mysql.com
serg@serg.mysql.com
tim@threads.polyesthetic.msg
tim@work.mysql.com
...@@ -26463,6 +26463,10 @@ option to @code{configure}, and the character set configuration files ...@@ -26463,6 +26463,10 @@ option to @code{configure}, and the character set configuration files
listed in @file{SHAREDIR/charsets/Index}. listed in @file{SHAREDIR/charsets/Index}.
@xref{Quick install}. @xref{Quick install}.
If you change the character set when running MySQL (which may also
change the sort order), you must run myisamchk -r -q on all
tables. Otherwise your indexes may not be ordered correctly.
When a client connects to a @strong{MySQL} server, the server sends the When a client connects to a @strong{MySQL} server, the server sends the
default character set in use to the client. The client will switch to default character set in use to the client. The client will switch to
use this character set for this connection. use this character set for this connection.
...@@ -863,6 +863,19 @@ buf_page_get_known_nowait( ...@@ -863,6 +863,19 @@ buf_page_get_known_nowait(
mutex_enter(&(buf_pool->mutex)); mutex_enter(&(buf_pool->mutex));
if (block->state == BUF_BLOCK_REMOVE_HASH) {
/* Another thread is just freeing the block from the LRU list
of the buffer pool: do not try to access this page; this
attempt to access the page can only come through the hash
index because when the buffer block state is ..._REMOVE_HASH,
we have already removed it from the page address hash table
of the buffer pool. */
mutex_exit(&(buf_pool->mutex));
return(FALSE);
}
#ifdef UNIV_SYNC_DEBUG #ifdef UNIV_SYNC_DEBUG
buf_block_buf_fix_inc_debug(block, file, line); buf_block_buf_fix_inc_debug(block, file, line);
#else #else
......
...@@ -138,6 +138,8 @@ buf_LRU_search_and_free_block( ...@@ -138,6 +138,8 @@ buf_LRU_search_and_free_block(
mutex_enter(&(buf_pool->mutex)); mutex_enter(&(buf_pool->mutex));
ut_a(block->buf_fix_count == 0);
buf_LRU_block_free_hashed_page(block); buf_LRU_block_free_hashed_page(block);
freed = TRUE; freed = TRUE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment