Commit ffbb896b authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/kent/bk/tmp2/mysql-5.0-build 

into  mysql.com:/home/kent/bk/tmp2/mysql-5.1-build


mysys/my_read.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
support-files/MySQL-shared-compat.spec.sh:
  Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Auto merged
BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e:
  Auto merged
BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e:
  Auto merged
BitKeeper/deleted/.del-mysqlserver.dsp~d99cfb2d291e3785:
  Auto merged
storage/innobase/buf/buf0buf.c:
  Auto merged
storage/innobase/fil/fil0fil.c:
  Auto merged
storage/innobase/ha/ha0ha.c:
  Auto merged
storage/innobase/ha/hash0hash.c:
  Auto merged
storage/innobase/include/hash0hash.h:
  Auto merged
storage/innobase/lock/lock0lock.c:
  Auto merged
storage/innobase/log/log0recv.c:
  Auto merged
storage/innobase/thr/thr0loc.c:
  Auto merged
parents 32b01395 b139c287

storage/innobase/buf/buf0buf.c

+1 −1
Original line number Diff line number Diff line
@@ -704,7 +704,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;

storage/innobase/dict/dict0dict.c

+2 −2
Original line number Diff line number Diff line
@@ -782,10 +782,10 @@ dict_init(void) 


	mutex_create(&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->size = 0;

storage/innobase/fil/fil0fil.c

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


	mutex_create(&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);

storage/innobase/ha/ha0ha.c

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

	ulint		i;



	table = hash0_create(n);

	table = hash_create(n);



	if (in_btr_search) {

		table->adaptive = TRUE;

storage/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 */