buf0buf.h		buf0buf.h
	skipping to change at line 896		skipping to change at line 896
	ib_mutex_t*		ib_mutex_t*
	buf_page_get_mutex(		buf_page_get_mutex(
	/*===============*/		/*===============*/
	const buf_page_t* bpage) /*!< in: pointer to control block */		const buf_page_t* bpage) /*!< in: pointer to control block */
	__attribute__((pure));		__attribute__((pure));
	/*********************************************************************//**		/*********************************************************************//**
	Get the flush type of a page.		Get the flush type of a page.
	@return flush type */		@return flush type */
	UNIV_INLINE		UNIV_INLINE
	enum buf_flush		buf_flush_t
	buf_page_get_flush_type(		buf_page_get_flush_type(
	/*====================*/		/*====================*/
	const buf_page_t* bpage) /*!< in: buffer page */		const buf_page_t* bpage) /*!< in: buffer page */
	__attribute__((pure));		__attribute__((pure));
	/*********************************************************************//**		/*********************************************************************//**
	Set the flush type of a page. */		Set the flush type of a page. */
	UNIV_INLINE		UNIV_INLINE
	void		void
	buf_page_set_flush_type(		buf_page_set_flush_type(
	/*====================*/		/*====================*/
	buf_page_t* bpage, /*!< in: buffer page */		buf_page_t* bpage, /*!< in: buffer page */
	enum buf_flush flush_type); /*!< in: flush type */		buf_flush_t flush_type); /*!< in: flush type */
	/*********************************************************************//**		/*********************************************************************//**
	Map a block to a file page. */		Map a block to a file page. */
	UNIV_INLINE		UNIV_INLINE
	void		void
	buf_block_set_file_page(		buf_block_set_file_page(
	/*====================*/		/*====================*/
	buf_block_t* block, /*!< in/out: pointer to control bloc k */		buf_block_t* block, /*!< in/out: pointer to control bloc k */
	ulint space, /*!< in: tablespace id */		ulint space, /*!< in: tablespace id */
	ulint page_no);/*!< in: page number */		ulint page_no);/*!< in: page number */
	/*********************************************************************//**		/*********************************************************************//**
	skipping to change at line 1450		skipping to change at line 1450
	page_hash mutex i.e.: if a page		page_hash mutex i.e.: if a page
	is in page_hash or is being		is in page_hash or is being
	added to/removed from page_hash		added to/removed from page_hash
	then the corresponding changes		then the corresponding changes
	must also be protected by		must also be protected by
	page_hash mutex. */		page_hash mutex. */
	#ifndef UNIV_HOTBACKUP		#ifndef UNIV_HOTBACKUP
	unsigned flush_type:2; /*!< if this block is currently bein g		unsigned flush_type:2; /*!< if this block is currently bein g
	flushed to disk, this tells the		flushed to disk, this tells the
	flush_type.		flush_type.
	@see enum buf_flush */		@see buf_flush_t */
	unsigned io_fix:2; /*!< type of pending I/O operation;		unsigned io_fix:2; /*!< type of pending I/O operation;
	also protected by buf_pool->mutex		also protected by buf_pool->mutex
	@see enum buf_io_fix */		@see enum buf_io_fix */
	unsigned buf_fix_count:19;/*!< count of how manyfold this blo ck		unsigned buf_fix_count:19;/*!< count of how manyfold this blo ck
	is currently bufferfixed */		is currently bufferfixed */
	unsigned buf_pool_index:6;/*!< index number of the buffer poo l		unsigned buf_pool_index:6;/*!< index number of the buffer poo l
	that this block belongs to */		that this block belongs to */
	# if MAX_BUFFER_POOLS > 64		# if MAX_BUFFER_POOLS > 64
	# error "MAX_BUFFER_POOLS > 64; redefine buf_pool_index:6"		# error "MAX_BUFFER_POOLS > 64; redefine buf_pool_index:6"
	# endif		# endif
	skipping to change at line 1857		skipping to change at line 1857
	/** @name Page flushing algorithm fields */		/** @name Page flushing algorithm fields */
	/* @{ */		/* @{ */
	ib_mutex_t flush_list_mutex;/*!< mutex protecting the		ib_mutex_t flush_list_mutex;/*!< mutex protecting the
	flush list access. This mutex		flush list access. This mutex
	protects flush_list, flush_rbt		protects flush_list, flush_rbt
	and bpage::list pointers when		and bpage::list pointers when
	the bpage is on flush_list. It		the bpage is on flush_list. It
	also protects writes to		also protects writes to
	bpage::oldest_modification */		bpage::oldest_modification and
			flush_list_hp */
			const buf_page_t* flush_list_hp;/*!< "hazard pointer"
			used during scan of flush_list
			while doing flush list batch.
			Protected by flush_list_mutex */
	UT_LIST_BASE_NODE_T(buf_page_t) flush_list;		UT_LIST_BASE_NODE_T(buf_page_t) flush_list;
	/*!< base node of the modified block		/*!< base node of the modified block
	list */		list */
	ibool init_flush[BUF_FLUSH_N_TYPES];		ibool init_flush[BUF_FLUSH_N_TYPES];
	/*!< this is TRUE when a flush of th e		/*!< this is TRUE when a flush of th e
	given type is being initialized */		given type is being initialized */
	ulint n_flush[BUF_FLUSH_N_TYPES];		ulint n_flush[BUF_FLUSH_N_TYPES];
	/*!< this is the number of pending		/*!< this is the number of pending
	writes in the given flush type */		writes in the given flush type */
	os_event_t no_flush[BUF_FLUSH_N_TYPES];		os_event_t no_flush[BUF_FLUSH_N_TYPES];
End of changes. 4 change blocks.
	4 lines changed or deleted		9 lines changed or added
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/