Commit d325a2c9 authored by monty@donna.mysql.fi's avatar monty@donna.mysql.fi
Browse files

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

parents 5ccbbd83 3abaff79

innobase/btr/btr0btr.c

+0 −3
Original line number Diff line number Diff line
@@ -6,9 +6,6 @@ The B-tree 
Created 6/2/1994 Heikki Tuuri

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



/* Test a change in bitkeeper */





#include "btr0btr.h"



#ifdef UNIV_NONINL

innobase/btr/btr0cur.c

+4 −3
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ Created 10/16/1994 Heikki Tuuri 


#include "page0page.h"

#include "rem0rec.h"

#include "rem0cmp.h"

#include "btr0btr.h"

#include "btr0sea.h"

#include "row0upd.h"
@@ -314,7 +315,7 @@ btr_cur_search_to_nth_level( 
		page = buf_page_get_gen(space, page_no, rw_latch, guess,

					buf_mode,

#ifdef UNIV_SYNC_DEBUG

					__FILE__, __LINE__,

					IB__FILE__, __LINE__,

#endif

					mtr);
@@ -485,7 +486,7 @@ btr_cur_open_at_index_side( 
		page = buf_page_get_gen(space, page_no, RW_NO_LATCH, NULL,

					BUF_GET,

#ifdef UNIV_SYNC_DEBUG

					__FILE__, __LINE__,

					IB__FILE__, __LINE__,

#endif

					mtr);

		ut_ad(0 == ut_dulint_cmp(tree->id,
@@ -574,7 +575,7 @@ btr_cur_open_at_rnd_pos( 
		page = buf_page_get_gen(space, page_no, RW_NO_LATCH, NULL,

					BUF_GET,

#ifdef UNIV_SYNC_DEBUG

					__FILE__, __LINE__,

					IB__FILE__, __LINE__,

#endif

					mtr);

		ut_ad(0 == ut_dulint_cmp(tree->id,

innobase/btr/btr0sea.c

+3 −3
Original line number Diff line number Diff line
@@ -187,13 +187,13 @@ btr_search_info_update_hash( 
		return;

	}



	n_unique = dict_index_get_n_unique_in_tree(index);



	if (info->n_hash_potential == 0) {



		goto set_new_recomm;

	}



	n_unique = dict_index_get_n_unique_in_tree(index);



	/* Test if the search would have succeeded using the recommended

	hash prefix */
@@ -676,7 +676,7 @@ btr_search_guess_on_hash( 
		success = buf_page_get_known_nowait(latch_mode, page,

						BUF_MAKE_YOUNG,

#ifdef UNIV_SYNC_DEBUG

						__FILE__, __LINE__,

						IB__FILE__, __LINE__,

#endif

						mtr);

innobase/buf/buf0buf.c

+1 −1
Original line number Diff line number Diff line
@@ -1117,7 +1117,7 @@ buf_page_create( 
	buf_LRU_add_block(block, FALSE);

		

#ifdef UNIV_SYNC_DEBUG

	buf_block_buf_fix_inc_debug(block, __FILE__, __LINE__);

	buf_block_buf_fix_inc_debug(block, IB__FILE__, __LINE__);

#else

	buf_block_buf_fix_inc(block);

#endif

innobase/buf/buf0flu.c

+1 −1
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ buf_flush_batch( 
	if (buf_debug_prints && (page_count > 0)) {

		if (flush_type == BUF_FLUSH_LRU) {

			printf("To flush %lu pages in LRU flush\n",

						page_count, flush_type);

						page_count);

		} else if (flush_type == BUF_FLUSH_LIST) {

			printf("To flush %lu pages in flush list flush\n",

						page_count, flush_type);