bk commit into 5.0 tree (tsmith:1.2369)

[tim]

Below is the list of changes that have just been committed into a local
5.0 repository of tsmith. When tsmith 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-16 12:37:14-07:00, tsmith@stripped +7 -0
  Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan12/41
  into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan12/50
  MERGE: 1.1616.2902.9

  innobase/buf/buf0buf.c@stripped, 2007-01-16 12:37:11-07:00, tsmith@stripped +0 -0
    SCCS merged
    MERGE: 1.38.1.4

  innobase/dict/dict0dict.c@stripped, 2007-01-16 12:37:11-07:00, tsmith@stripped +0 -0
    SCCS merged
    MERGE: 1.52.1.17

  innobase/fil/fil0fil.c@stripped, 2007-01-16 12:37:11-07:00, tsmith@stripped +0 -0
    SCCS merged
    MERGE: 1.41.1.16

  innobase/ha/ha0ha.c@stripped, 2007-01-16 12:37:11-07:00, tsmith@stripped +0 -0
    SCCS merged
    MERGE: 1.13.1.2

  innobase/include/hash0hash.h@stripped, 2007-01-16 12:37:11-07:00, tsmith@stripped +0 -0
    SCCS merged
    MERGE: 1.4.1.2

  innobase/lock/lock0lock.c@stripped, 2007-01-16 12:37:11-07:00, tsmith@stripped +0 -0
    SCCS merged
    MERGE: 1.43.1.7

  innobase/log/log0recv.c@stripped, 2007-01-16 12:37:11-07:00, tsmith@stripped +0 -0
    SCCS merged
    MERGE: 1.38.1.5

# 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:	tsmith
# Host:	siva.hindu.god
# Root:	/home/tsmith/m/bk/mrg-jan12/50/RESYNC

--- 1.56/innobase/buf/buf0buf.c	2007-01-16 12:13:02 -07:00
+++ 1.57/innobase/buf/buf0buf.c	2007-01-16 12:37:11 -07:00
@@ -649,7 +649,7 @@
 		}
 	}
 
-	buf_pool->page_hash = hash0_create(2 * max_size);
+	buf_pool->page_hash = hash_create(2 * max_size);
 
 	buf_pool->n_pend_reads = 0;
 

--- 1.78/innobase/dict/dict0dict.c	2007-01-01 02:51:42 -07:00
+++ 1.79/innobase/dict/dict0dict.c	2007-01-16 12:37:11 -07:00
@@ -708,13 +708,13 @@
 	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;

--- 1.69/innobase/fil/fil0fil.c	2007-01-01 02:51:42 -07:00
+++ 1.70/innobase/fil/fil0fil.c	2007-01-16 12:37:11 -07:00
@@ -1294,8 +1294,8 @@
 
 	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);
 

--- 1.17/innobase/ha/ha0ha.c	2007-01-01 02:51:42 -07:00
+++ 1.18/innobase/ha/ha0ha.c	2007-01-16 12:37:11 -07:00
@@ -32,7 +32,7 @@
 	hash_table_t*	table;
 	ulint		i;
 
-	table = hash0_create(n);
+	table = hash_create(n);
 
 	if (in_btr_search) {
 		table->adaptive = TRUE;

--- 1.7/innobase/include/hash0hash.h	2007-01-01 02:51:42 -07:00
+++ 1.8/innobase/include/hash0hash.h	2007-01-16 12:37:11 -07:00
@@ -18,12 +18,15 @@
 
 typedef void*	hash_node_t;
 
+/* Fix Bug #13859: symbol collision between imap/mysql */
+#define hash_create hash0_create
+
 /*****************************************************************
 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 */

--- 1.67/innobase/lock/lock0lock.c	2007-01-01 02:51:42 -07:00
+++ 1.68/innobase/lock/lock0lock.c	2007-01-16 12:37:11 -07:00
@@ -584,7 +584,7 @@
 {
 	lock_sys = mem_alloc(sizeof(lock_sys_t));
 
-	lock_sys->rec_hash = hash0_create(n_cells);
+	lock_sys->rec_hash = hash_create(n_cells);
 
 	/* hash_create_mutexes(lock_sys->rec_hash, 2, SYNC_REC_LOCK); */
 

--- 1.55/innobase/log/log0recv.c	2007-01-01 02:51:42 -07:00
+++ 1.56/innobase/log/log0recv.c	2007-01-16 12:37:11 -07:00
@@ -148,7 +148,7 @@
 	recv_sys->len = 0;
 	recv_sys->recovered_offset = 0;
 
-	recv_sys->addr_hash = hash0_create(available_memory / 64);
+	recv_sys->addr_hash = hash_create(available_memory / 64);
 	recv_sys->n_addrs = 0;
 	
 	recv_sys->apply_log_recs = FALSE;
@@ -187,7 +187,7 @@
 	hash_table_free(recv_sys->addr_hash);
 	mem_heap_empty(recv_sys->heap);
 
-	recv_sys->addr_hash = hash0_create(buf_pool_get_curr_size() / 256);
+	recv_sys->addr_hash = hash_create(buf_pool_get_curr_size() / 256);
 }
 
 /************************************************************