mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 04:22:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Docs/manual.texi:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
This commit is contained in:
unknown 2001-03-16 02:43:51 +02:00
commit b995f37d6b
4 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
BitKeeper/etc/logging_ok
View file

@ -1,12 +1,3 @@
jani@hynda.mysql.fi
heikki@donna.mysql.fi
jcole@abel.spaceapes.com
jcole@tetra.spaceapes.com
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

4
Docs/manual.texi
View file

@ -26463,6 +26463,10 @@ option to @code{configure}, and the character set configuration files
listed in @file{SHAREDIR/charsets/Index}.
@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
default character set in use to the client. The client will switch to
use this character set for this connection.

13
innobase/buf/buf0buf.c
View file

@ -863,6 +863,19 @@ buf_page_get_known_nowait(
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
buf_block_buf_fix_inc_debug(block, file, line);
#else

4
innobase/buf/buf0lru.c
View file

@ -138,6 +138,8 @@ buf_LRU_search_and_free_block(
mutex_enter(&(buf_pool->mutex));
ut_a(block->buf_fix_count == 0);
buf_LRU_block_free_hashed_page(block);
freed = TRUE;
@ -435,7 +437,7 @@ buf_LRU_add_block_to_end_low(
defined: init it */
buf_LRU_old_init();
}
}
}
/**********************************************************************