merged from 3.23 to pull the LOAD DATA INFILE fix as rpl000001 was failing.

Let's hope this did not break anything. Will not push this one until Monty
gets back


BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-all-build-steps:
  Auto merged
Build-tools/Do-compile:
  Auto merged
Build-tools/Do-rpm:
  Auto merged
Docs/manual.texi:
  Auto merged
include/hash.h:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
mysys/array.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/mf_qsort.c:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/table.cc:
  Auto merged
strings/Makefile.am:
  Auto merged
client/mysql.cc:
  merged from 3.23
configure.in:
  merged from 3.23
mysql-test/mysql-test-run.sh:
  merged from 3.23
sql/mysqld.cc:
  merged from 3.23
support-files/mysql.spec.sh:
  merged from 3.23

1 files changed, 3 insertions, 3 deletions

diff --git a/mysys/hash.c b/mysys/hash.c
index 0b326ebc508..b3769d1dfb2 100644
--- a/mysys/hash.c
+++ b/mysys/hash.c
@@ -36,15 +36,15 @@ static uint calc_hashnr_caseup(const byte *key,uint length);
 static int hashcmp(HASH *hash,HASH_LINK *pos,const byte *key,uint length);
 
 
-my_bool hash_init(HASH *hash,uint size,uint key_offset,uint key_length,
+my_bool _hash_init(HASH *hash,uint size,uint key_offset,uint key_length,
 		  hash_get_key get_key,
-		  void (*free_element)(void*),uint flags)
+		  void (*free_element)(void*),uint flags CALLER_INFO_PROTO)
 {
   DBUG_ENTER("hash_init");
   DBUG_PRINT("enter",("hash: %lx  size: %d",hash,size));
 
   hash->records=0;
-  if (init_dynamic_array(&hash->array,sizeof(HASH_LINK),size,0))
+  if (init_dynamic_array_ci(&hash->array,sizeof(HASH_LINK),size,0))
   {
     hash->free=0;				/* Allow call to hash_free */
     DBUG_RETURN(TRUE);