Commit 87be629e authored by unknown's avatar unknown
Browse files

Merge trift2.:/MySQL/M50/mysql-5.0 

into  trift2.:/MySQL/M50/push-5.0
parents 7a9892cc 3685d889

innobase/buf/buf0buf.c

+1 −1
Original line number Diff line number Diff line
@@ -649,7 +649,7 @@ buf_pool_init( 
		}

	}



	buf_pool->page_hash = hash0_create(2 * max_size);

	buf_pool->page_hash = hash_create(2 * max_size);



	buf_pool->n_pend_reads = 0;

innobase/dict/dict0dict.c

+3 −3
Original line number Diff line number Diff line
@@ -708,13 +708,13 @@ dict_init(void) 
	mutex_create(&(dict_sys->mutex));

	mutex_set_level(&(dict_sys->mutex), SYNC_DICT);



	dict_sys->table_hash = hash0_create(buf_pool_get_max_size() /

	dict_sys->table_hash = hash_create(buf_pool_get_max_size() /

					(DICT_POOL_PER_TABLE_HASH *

					UNIV_WORD_SIZE));

	dict_sys->table_id_hash = hash0_create(buf_pool_get_max_size() /

	dict_sys->table_id_hash = hash_create(buf_pool_get_max_size() /

					(DICT_POOL_PER_TABLE_HASH *

					UNIV_WORD_SIZE));

	dict_sys->col_hash = hash0_create(buf_pool_get_max_size() /

	dict_sys->col_hash = hash_create(buf_pool_get_max_size() /

					(DICT_POOL_PER_COL_HASH *

					UNIV_WORD_SIZE));

	dict_sys->size = 0;

innobase/fil/fil0fil.c

+2 −2
Original line number Diff line number Diff line
@@ -1294,8 +1294,8 @@ fil_system_create( 


	mutex_set_level(&(system->mutex), SYNC_ANY_LATCH);



	system->spaces = hash0_create(hash_size);

	system->name_hash = hash0_create(hash_size);

	system->spaces = hash_create(hash_size);

	system->name_hash = hash_create(hash_size);



	UT_LIST_INIT(system->LRU);

innobase/ha/ha0ha.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ ha_create( 
	hash_table_t*	table;

	ulint		i;



	table = hash0_create(n);

	table = hash_create(n);



	if (in_btr_search) {

		table->adaptive = TRUE;

innobase/ha/hash0hash.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ Creates a hash table with >= n array cells. The actual number of cells is 
chosen to be a prime number slightly bigger than n. */



hash_table_t*

hash0_create(

hash_create(

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

			/* out, own: created table */

	ulint	n)	/* in: number of array cells */