List:Commits« Previous MessageNext Message »
From:kent Date:January 1 2007 9:50am
Subject:bk commit into 4.1 tree (kent:1.2589) BUG#13859
View as plain text  
Below is the list of changes that have just been committed into a local
4.1 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-01 10:50:39+01:00, kent@stripped +9 -0
  Many files:
    Renamed hash_create() not to clash with imap using embedded server (bug#13859)

  innobase/buf/buf0buf.c@stripped, 2007-01-01 10:50:21+01:00, kent@stripped +1 -1
    Renamed hash_create() not to clash with imap using embedded server (bug#13859)

  innobase/dict/dict0dict.c@stripped, 2007-01-01 10:50:21+01:00, kent@stripped +3 -3
    Renamed hash_create() not to clash with imap using embedded server (bug#13859)

  innobase/fil/fil0fil.c@stripped, 2007-01-01 10:50:21+01:00, kent@stripped +2 -2
    Renamed hash_create() not to clash with imap using embedded server (bug#13859)

  innobase/ha/ha0ha.c@stripped, 2007-01-01 10:50:21+01:00, kent@stripped +1 -1
    Renamed hash_create() not to clash with imap using embedded server (bug#13859)

  innobase/ha/hash0hash.c@stripped, 2007-01-01 10:50:21+01:00, kent@stripped +1 -1
    Renamed hash_create() not to clash with imap using embedded server (bug#13859)

  innobase/include/hash0hash.h@stripped, 2007-01-01 10:50:21+01:00, kent@stripped +1 -1
    Renamed hash_create() not to clash with imap using embedded server (bug#13859)

  innobase/lock/lock0lock.c@stripped, 2007-01-01 10:50:21+01:00, kent@stripped +1 -1
    Renamed hash_create() not to clash with imap using embedded server (bug#13859)

  innobase/log/log0recv.c@stripped, 2007-01-01 10:50:21+01:00, kent@stripped +2 -2
    Renamed hash_create() not to clash with imap using embedded server (bug#13859)

  innobase/thr/thr0loc.c@stripped, 2007-01-01 10:50:21+01:00, kent@stripped +1 -1
    Renamed hash_create() not to clash with imap using embedded server (bug#13859)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	kent-amd64.(none)
# Root:	/home/kent/bk/mysql-4.1-build

--- 1.40/innobase/buf/buf0buf.c	2007-01-01 10:50:41 +01:00
+++ 1.41/innobase/buf/buf0buf.c	2007-01-01 10:50:41 +01:00
@@ -621,7 +621,7 @@
 		}
 	}
 
-	buf_pool->page_hash = hash_create(2 * max_size);
+	buf_pool->page_hash = hash0_create(2 * max_size);
 
 	buf_pool->n_pend_reads = 0;
 

--- 1.67/innobase/dict/dict0dict.c	2007-01-01 10:50:41 +01:00
+++ 1.68/innobase/dict/dict0dict.c	2007-01-01 10:50:41 +01:00
@@ -703,13 +703,13 @@
 	mutex_create(&(dict_sys->mutex));
 	mutex_set_level(&(dict_sys->mutex), SYNC_DICT);
 
-	dict_sys->table_hash = hash_create(buf_pool_get_max_size() /
+	dict_sys->table_hash = hash0_create(buf_pool_get_max_size() /
 					(DICT_POOL_PER_TABLE_HASH *
 					UNIV_WORD_SIZE));
-	dict_sys->table_id_hash = hash_create(buf_pool_get_max_size() /
+	dict_sys->table_id_hash = hash0_create(buf_pool_get_max_size() /
 					(DICT_POOL_PER_TABLE_HASH *
 					UNIV_WORD_SIZE));
-	dict_sys->col_hash = hash_create(buf_pool_get_max_size() /
+	dict_sys->col_hash = hash0_create(buf_pool_get_max_size() /
 					(DICT_POOL_PER_COL_HASH *
 					UNIV_WORD_SIZE));
 	dict_sys->size = 0;

--- 1.55/innobase/fil/fil0fil.c	2007-01-01 10:50:41 +01:00
+++ 1.56/innobase/fil/fil0fil.c	2007-01-01 10:50:41 +01:00
@@ -1295,8 +1295,8 @@
 
 	mutex_set_level(&(system->mutex), SYNC_ANY_LATCH);
 
-	system->spaces = hash_create(hash_size);
-	system->name_hash = hash_create(hash_size);
+	system->spaces = hash0_create(hash_size);
+	system->name_hash = hash0_create(hash_size);
 
 	UT_LIST_INIT(system->LRU);
 

--- 1.13/innobase/ha/ha0ha.c	2007-01-01 10:50:41 +01:00
+++ 1.14/innobase/ha/ha0ha.c	2007-01-01 10:50:41 +01:00
@@ -32,7 +32,7 @@
 	hash_table_t*	table;
 	ulint		i;
 
-	table = hash_create(n);
+	table = hash0_create(n);
 
 	if (in_btr_search) {
 		table->adaptive = TRUE;

--- 1.4/innobase/ha/hash0hash.c	2007-01-01 10:50:41 +01:00
+++ 1.5/innobase/ha/hash0hash.c	2007-01-01 10:50:41 +01:00
@@ -74,7 +74,7 @@
 chosen to be a prime number slightly bigger than n. */
 
 hash_table_t*
-hash_create(
+hash0_create(
 /*========*/
 			/* out, own: created table */
 	ulint	n)	/* in: number of array cells */

--- 1.4/innobase/include/hash0hash.h	2007-01-01 10:50:42 +01:00
+++ 1.5/innobase/include/hash0hash.h	2007-01-01 10:50:42 +01:00
@@ -23,7 +23,7 @@
 of cells is chosen to be a prime number slightly bigger than n. */
 
 hash_table_t*
-hash_create(
+hash0_create(
 /*========*/
 			/* out, own: created table */
 	ulint	n);	/* in: number of array cells */

--- 1.48/innobase/lock/lock0lock.c	2007-01-01 10:50:42 +01:00
+++ 1.49/innobase/lock/lock0lock.c	2007-01-01 10:50:42 +01:00
@@ -550,7 +550,7 @@
 {
 	lock_sys = mem_alloc(sizeof(lock_sys_t));
 
-	lock_sys->rec_hash = hash_create(n_cells);
+	lock_sys->rec_hash = hash0_create(n_cells);
 
 	/* hash_create_mutexes(lock_sys->rec_hash, 2, SYNC_REC_LOCK); */
 

--- 1.41/innobase/log/log0recv.c	2007-01-01 10:50:42 +01:00
+++ 1.42/innobase/log/log0recv.c	2007-01-01 10:50:42 +01:00
@@ -147,7 +147,7 @@
 	recv_sys->len = 0;
 	recv_sys->recovered_offset = 0;
 
-	recv_sys->addr_hash = hash_create(available_memory / 64);
+	recv_sys->addr_hash = hash0_create(available_memory / 64);
 	recv_sys->n_addrs = 0;
 	
 	recv_sys->apply_log_recs = FALSE;
@@ -186,7 +186,7 @@
 	hash_table_free(recv_sys->addr_hash);
 	mem_heap_empty(recv_sys->heap);
 
-	recv_sys->addr_hash = hash_create(buf_pool_get_curr_size() / 256);
+	recv_sys->addr_hash = hash0_create(buf_pool_get_curr_size() / 256);
 }
 
 /************************************************************

--- 1.7/innobase/thr/thr0loc.c	2007-01-01 10:50:42 +01:00
+++ 1.8/innobase/thr/thr0loc.c	2007-01-01 10:50:42 +01:00
@@ -224,7 +224,7 @@
 
 	ut_a(thr_local_hash == NULL);
 
-	thr_local_hash = hash_create(OS_THREAD_MAX_N + 100);
+	thr_local_hash = hash0_create(OS_THREAD_MAX_N + 100);
 
 	mutex_create(&thr_local_mutex);
 	mutex_set_level(&thr_local_mutex, SYNC_THR_LOCAL);
Thread
bk commit into 4.1 tree (kent:1.2589) BUG#13859kent1 Jan