diff options
| author | unknown <ramil@mysql.com> | 2006-03-03 15:32:00 +0400 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2006-03-03 15:32:00 +0400 |
| commit | 38af49e6dbf73014cfd8cc4d2f239defe2a0622f (patch) | |
| tree | 48c313fd68df18cd0a97c1451521e0b36ad37eb8 /sql/hostname.cc | |
| parent | d95921376ca02d79009995a10cd2925a656a703d (diff) | |
| parent | a63df041da4c6ab9eb7788eee69aac6cb243318c (diff) | |
| download | mariadb-git-38af49e6dbf73014cfd8cc4d2f239defe2a0622f.tar.gz | |
Merge mysql.com:/usr/home/ram/work/mysql-4.1
into mysql.com:/usr/home/ram/work/mysql-5.0
sql/hostname.cc:
Auto merged
Diffstat (limited to 'sql/hostname.cc')
| -rw-r--r-- | sql/hostname.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/hostname.cc b/sql/hostname.cc index 3b1eeb63d37..c5c337080cf 100644 --- a/sql/hostname.cc +++ b/sql/hostname.cc @@ -61,7 +61,7 @@ bool hostname_cache_init() if (!(hostname_cache=new hash_filo(HOST_CACHE_SIZE, offset, sizeof(struct in_addr),NULL, (hash_free_key) free, - &my_charset_latin1))) + &my_charset_bin))) return 1; hostname_cache->clear(); (void) pthread_mutex_init(&LOCK_hostname,MY_MUTEX_INIT_SLOW); |