merge to mysql-5.0-bugteam

This commit is contained in:
Satya B 2009-10-20 12:21:58 +05:30
commit 034627aeec
3 changed files with 7 additions and 3 deletions

View File

@ -1,4 +1,4 @@
[MYSQL]
post_commit_to = "commits@lists.mysql.com"
post_push_to = "commits@lists.mysql.com"
tree_name = "mysql-5.0-bugteam"
tree_name = "mysql-5.0"

View File

@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line!
# remember to also change ndb version below and update version.c in ndb
AM_INIT_AUTOMAKE(mysql, 5.0.87)
AM_INIT_AUTOMAKE(mysql, 5.0.88)
AM_CONFIG_HEADER([include/config.h:config.h.in])
PROTOCOL_VERSION=10
@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
# ndb version
NDB_VERSION_MAJOR=5
NDB_VERSION_MINOR=0
NDB_VERSION_BUILD=87
NDB_VERSION_BUILD=88
NDB_VERSION_STATUS=""
# Set all version vars based on $VERSION. How do we do this more elegant ?

View File

@ -1742,6 +1742,7 @@ restart:
- block assigned but not yet read from file (invalid data).
*/
#ifdef THREAD
if (keycache->in_resize)
{
/* This is a request during a resize operation */
@ -1983,6 +1984,9 @@ restart:
}
DBUG_RETURN(0);
}
#else /* THREAD */
DBUG_ASSERT(!keycache->in_resize);
#endif
if (page_status == PAGE_READ &&
(block->status & (BLOCK_IN_EVICTION | BLOCK_IN_SWITCH |