Commit 97746386 authored by unknown's avatar unknown
Browse files

Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  production.mysql.com:/usersnfs/knielsen/mysql-5.0
parents 05144f7e 700e6cbd

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ SHARED_LIB_VERSION=15:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=17

NDB_VERSION_BUILD=18

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?

extra/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ SUBDIRS= 
DIST_SUBDIRS=           yassl



# This will build mysqld_error.h and sql_state.h

$(top_builddir)/include/mysqld_error.h: comp_err

	$(top_builddir)/extra/comp_err \

$(top_builddir)/include/mysqld_error.h: comp_err$(EXEEXT)

	$(top_builddir)/extra/comp_err$(EXEEXT) \

	--charset=$(top_srcdir)/sql/share/charsets \

	--out-dir=$(top_builddir)/sql/share/ \

	--header_file=$(top_builddir)/include/mysqld_error.h \

innobase/btr/btr0sea.c

+2 −1
Original line number Diff line number Diff line
@@ -889,7 +889,8 @@ Drops a page hash index. */ 
void

btr_search_drop_page_hash_index(

/*============================*/

	page_t*	page)	/* in: index page, s- or x-latched */

	page_t*	page)	/* in: index page, s- or x-latched, or an index page

			for which we know that block->buf_fix_count == 0 */

{

	hash_table_t*	table;

	buf_block_t*	block;

innobase/include/buf0buf.h

+8 −6
Original line number Diff line number Diff line
@@ -831,7 +831,13 @@ struct buf_block_struct{ 
					records with the same prefix should be

					indexed in the hash index */

					

	/* The following 6 fields are protected by btr_search_latch: */

	/* These 6 fields may only be modified when we have

	an x-latch on btr_search_latch AND

	a) we are holding an s-latch or x-latch on block->lock or

	b) we know that block->buf_fix_count == 0.



	An exception to this is when we init or create a page

	in the buffer pool in buf0buf.c. */



	ibool		is_hashed;	/* TRUE if hash index has already been

					built on this page; note that it does
@@ -849,11 +855,7 @@ struct buf_block_struct{ 
					BTR_SEARCH_RIGHT_SIDE in hash

					indexing */

	dict_index_t*	index;		/* Index for which the adaptive

					hash index has been created.

					This field may only be modified

					while holding an s-latch or x-latch

					on block->lock and an x-latch on

					btr_search_latch. */

					hash index has been created. */

	/* 6. Debug fields */

#ifdef UNIV_SYNC_DEBUG

	rw_lock_t	debug_latch;	/* in the debug version, each thread

innobase/include/os0file.h

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ Creates a temporary file. */ 
FILE*

os_file_create_tmpfile(void);

/*========================*/

			/* out: temporary file handle (never NULL) */

			/* out: temporary file handle, or NULL on error */

/***************************************************************************

The os_file_opendir() function opens a directory stream corresponding to the

directory named by the dirname argument. The directory stream is positioned