Commit 5fda3c2c authored by unknown's avatar unknown
Browse files

Merge siva.hindu.god:/usr/home/tim/m/bk/inno/51 

into  siva.hindu.god:/usr/home/tim/m/bk/51
parents 4ab87172 f1bc98c8

storage/innobase/btr/btr0btr.c

+0 −3
Original line number Diff line number Diff line
@@ -571,9 +571,6 @@ btr_page_get_father_for_rec( 
	tuple = dict_index_build_node_ptr(index, user_rec, 0, heap,

					  btr_page_get_level(page, mtr));



	/* In the following, we choose just any index from the tree as the

	first parameter for btr_cur_search_to_nth_level. */



	btr_cur_search_to_nth_level(index,

				    btr_page_get_level(page, mtr) + 1,

				    tuple, PAGE_CUR_LE,

storage/innobase/dict/dict0dict.c

+3 −19
Original line number Diff line number Diff line
@@ -3547,6 +3547,7 @@ dict_foreign_parse_drop_constraints( 


/*==================== END OF FOREIGN KEY PROCESSING ====================*/



#ifdef UNIV_DEBUG

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

Returns an index object if it is found in the dictionary cache. */
@@ -3556,7 +3557,6 @@ dict_index_get_if_in_cache( 
				/* out: index, NULL if not found */

	dulint	index_id)	/* in: index id */

{

	dict_table_t*	table;

	dict_index_t*	index;



	if (dict_sys == NULL) {
@@ -3565,29 +3565,13 @@ dict_index_get_if_in_cache( 


	mutex_enter(&(dict_sys->mutex));



	table = UT_LIST_GET_FIRST(dict_sys->table_LRU);



	while (table) {

		index = UT_LIST_GET_FIRST(table->indexes);



		while (index) {

			if (0 == ut_dulint_cmp(index->id, index_id)) {



				goto found;

			}



			index = UT_LIST_GET_NEXT(indexes, index);

		}



		table = UT_LIST_GET_NEXT(table_LRU, table);

	}

	index = dict_index_find_on_id_low(index_id);



	index = NULL;

found:

	mutex_exit(&(dict_sys->mutex));



	return(index);

}

#endif /* UNIV_DEBUG */



#ifdef UNIV_DEBUG

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

storage/innobase/handler/ha_innodb.cc

+7 −6
Original line number Diff line number Diff line
@@ -6630,7 +6630,7 @@ innodb_mutex_show_status( 
					mutex->count_spin_rounds,

					mutex->count_os_wait,

					mutex->count_os_yield,

					mutex->lspent_time/1000);

					(ulong) mutex->lspent_time/1000);



				if (stat_print(thd, innobase_hton_name,

						hton_name_len, buf1, buf1len,
@@ -6660,7 +6660,7 @@ innodb_mutex_show_status( 
		rw_lock_count, rw_lock_count_spin_loop,

		rw_lock_count_spin_rounds,

		rw_lock_count_os_wait, rw_lock_count_os_yield,

		rw_lock_wait_time/1000);

		(ulong) rw_lock_wait_time/1000);



	if (stat_print(thd, innobase_hton_name, hton_name_len,

			STRING_WITH_LEN("rw_lock_mutexes"), buf2, buf2len)) {
@@ -6812,7 +6812,8 @@ ha_innobase::store_lock( 
			&& lock_type != TL_IGNORE)) {



		/* The OR cases above are in this order:

		1) MySQL is doing LOCK TABLES ... READ LOCAL, or

		1) MySQL is doing LOCK TABLES ... READ LOCAL, or we

		are processing a stored procedure or function, or

		2) (we do not know when TL_READ_HIGH_PRIORITY is used), or

		3) this is a SELECT ... IN SHARE MODE, or

		4) we are doing a complex SQL statement like
@@ -6880,7 +6881,8 @@ ha_innobase::store_lock( 
		single transaction stored procedure call deterministic

		(if it does not use a consistent read). */



		if (lock_type == TL_READ && thd->in_lock_tables) {

		if (lock_type == TL_READ

		    && thd->lex->sql_command == SQLCOM_LOCK_TABLES) {

			/* We come here if MySQL is processing LOCK TABLES

			... READ LOCAL. MyISAM under that table lock type

			reads the table as it was at the time the lock was
@@ -6939,8 +6941,7 @@ ha_innobase::store_lock( 
		(MySQL does have thd->in_lock_tables TRUE there). */



		if (lock_type == TL_READ_NO_INSERT

			&& (!thd->in_lock_tables

				|| thd->lex->sql_command == SQLCOM_CALL)) {

		    && thd->lex->sql_command != SQLCOM_LOCK_TABLES) {



			lock_type = TL_READ;

		}

storage/innobase/include/dict0dict.h

+1 −3
Original line number Diff line number Diff line
@@ -778,9 +778,8 @@ const dict_col_t* 
dict_field_get_col(

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

	const dict_field_t*	field);

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

In an index tree, finds the index corresponding to a record in the tree. */



#ifdef UNIV_DEBUG

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

Returns an index object if it is found in the dictionary cache. */
@@ -789,7 +788,6 @@ dict_index_get_if_in_cache( 
/*=======================*/

				/* out: index, NULL if not found */

	dulint	index_id);	/* in: index id */

#ifdef UNIV_DEBUG

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

Checks that a tuple has n_fields_cmp value in a sensible range, so that

no comparison can occur with the page number field in a node pointer. */

storage/innobase/include/mem0dbg.h

+4 −9
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ check fields at the both ends of the field. */ 
#define MEM_SPACE_NEEDED(N) ut_calc_align((N), UNIV_MEM_ALIGNMENT)

#endif



#if defined UNIV_MEM_DEBUG || defined UNIV_DEBUG

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

Checks a memory heap for consistency and prints the contents if requested.

Outputs the sum of sizes of buffers given to the user (only in
@@ -59,15 +60,8 @@ mem_heap_validate_or_print( 
	ulint*		n_blocks); /* out: number of blocks in the heap,

				if a NULL pointer is passed as this

				argument, it is ignored */

#ifdef UNIV_MEM_DEBUG

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

Prints the contents of a memory heap. */



void

mem_heap_print(

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

	mem_heap_t*   heap);	/* in: memory heap */

#endif /* UNIV_MEM_DEBUG */

#endif /* UNIV_MEM_DEBUG || UNIV_DEBUG */

#ifdef UNIV_DEBUG

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

Checks that an object is a memory heap (or a block of it) */
@@ -76,6 +70,7 @@ mem_heap_check( 
/*===========*/

				/* out: TRUE if ok */

	mem_heap_t*   heap);	/* in: memory heap */

#endif /* UNIV_DEBUG */

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

Validates the contents of a memory heap. */