Commit 53fe782e authored by Georgi Kodinov's avatar Georgi Kodinov
Browse files

merged 5.0-main to 5.0-bugteam

parents 4b2dd025 d2c1c397

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -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.68)

AM_INIT_AUTOMAKE(mysql, 5.0.70)

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=68

NDB_VERSION_BUILD=70

NDB_VERSION_STATUS=""



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

innobase/buf/buf0buf.c

+2 −0
Original line number Diff line number Diff line
@@ -2260,6 +2260,7 @@ buf_print(void) 
	ut_a(buf_validate());

}	



#ifdef UNIV_DEBUG

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

Returns the number of latched pages in the buffer pool. */
@@ -2290,6 +2291,7 @@ buf_get_latched_pages_number(void) 
        mutex_exit(&(buf_pool->mutex));

        return fixed_pages_number;

}

#endif /* UNIV_DEBUG */



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

Returns the number of pending buf pool ios. */

innobase/dict/dict0dict.c

+1 −1
Original line number Diff line number Diff line
@@ -3554,7 +3554,7 @@ dict_foreign_parse_drop_constraints( 


	ptr = dict_accept(ptr, "FOREIGN", &success);

	

	if (!success) {

	if (!success || !ib_isspace(*ptr)) {



	        goto loop;

	}

innobase/include/buf0buf.h

+8 −5
Original line number Diff line number Diff line
@@ -495,7 +495,15 @@ Prints info of the buffer pool data structure. */ 
void

buf_print(void);

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



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

Returns the number of latched pages in the buffer pool. */



ulint

buf_get_latched_pages_number(void);

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

#endif /* UNIV_DEBUG */



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

Prints a page to stderr. */
@@ -503,12 +511,7 @@ void 
buf_page_print(

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

	byte*	read_buf);	/* in: a database page */

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

Returns the number of latched pages in the buffer pool. */



ulint

buf_get_latched_pages_number(void);

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

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

Returns the number of pending buf pool ios. */

innobase/include/srv0srv.h

+2 −0
Original line number Diff line number Diff line
@@ -531,7 +531,9 @@ struct export_var_struct{ 
        ulint innodb_buffer_pool_pages_dirty;

        ulint innodb_buffer_pool_pages_misc;

        ulint innodb_buffer_pool_pages_free;

#ifdef UNIV_DEBUG

        ulint innodb_buffer_pool_pages_latched;

#endif /* UNIV_DEBUG */

        ulint innodb_buffer_pool_read_requests;

        ulint innodb_buffer_pool_reads;

        ulint innodb_buffer_pool_wait_free;