summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorV Narayanan <v.narayanan@sun.com>2009-12-11 17:27:12 +0530
committerV Narayanan <v.narayanan@sun.com>2009-12-11 17:27:12 +0530
commit360b2ff4ce5a09016f9e68a9ac9b790be25cac1b (patch)
tree2bdf3b39d8de71c63b5e62ce308bcd451116d902 /storage
parent3fded1b6c1294c24b6d0985ea1c22ebac5332c47 (diff)
parente3c1ee24fc0128915a3d09ac82c433ab1ae186ee (diff)
downloadmariadb-git-360b2ff4ce5a09016f9e68a9ac9b790be25cac1b.tar.gz
merging with mysql-5.1-bugteam
Diffstat (limited to 'storage')
-rw-r--r--storage/ibmdb2i/ha_ibmdb2i.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/ibmdb2i/ha_ibmdb2i.cc b/storage/ibmdb2i/ha_ibmdb2i.cc
index 0fc2d1e83dc..39096be7848 100644
--- a/storage/ibmdb2i/ha_ibmdb2i.cc
+++ b/storage/ibmdb2i/ha_ibmdb2i.cc
@@ -284,7 +284,7 @@ static int ibmdb2i_init_func(void *p)
was_ILE_inited = false;
ibmdb2i_hton= (handlerton *)p;
VOID(pthread_mutex_init(&ibmdb2i_mutex,MY_MUTEX_INIT_FAST));
- (void) hash_init(&ibmdb2i_open_tables,system_charset_info,32,0,0,
+ (void) hash_init(&ibmdb2i_open_tables,table_alias_charset,32,0,0,
(hash_get_key) ibmdb2i_get_key,0,0);
ibmdb2i_hton->state= SHOW_OPTION_YES;