diff options
| author | monty@mashka.mysql.fi <> | 2002-10-02 17:55:12 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-10-02 17:55:12 +0300 |
| commit | 0f394576131c2f66046673420ca8b1311981a614 (patch) | |
| tree | a7ce8fe730bd0e06166bb15edcbe5aef252c2c3b /sql/ha_innodb.cc | |
| parent | 7377f546316b13c2563fede4c3ed2506d29a93ac (diff) | |
| parent | 4d705988d562cac60d44e22f8d6e76df63432c72 (diff) | |
| download | mariadb-git-0f394576131c2f66046673420ca8b1311981a614.tar.gz | |
Merge with 4.0.4
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 2c27f565895..b684d9dd4dd 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -756,9 +756,8 @@ innobase_init(void) DBUG_RETURN(1); } - - (void) hash_init(&innobase_open_tables,32,0,0, - (hash_get_key) innobase_get_key,0,0); + (void) hash_init(&innobase_open_tables,system_charset_info,32,0,0, + (hash_get_key) innobase_get_key,0,0); pthread_mutex_init(&innobase_mutex,MY_MUTEX_INIT_FAST); /* If this is a replication slave and we needed to do a crash recovery, @@ -1365,7 +1364,10 @@ innobase_mysql_cmp( case FIELD_TYPE_STRING: case FIELD_TYPE_VAR_STRING: - ret = my_sortncmp((const char*) a, a_length, + // BAR TODO: Discuss with heikki.tuuri@innodb.com + // so that he sends CHARSET_INFO for the field to this function. + ret = my_sortncmp(default_charset_info, + (const char*) a, a_length, (const char*) b, b_length); if (ret < 0) { return(-1); @@ -3813,7 +3815,7 @@ innodb_show_status( ut_free(buf); - send_eof(&thd->net); + send_eof(thd); DBUG_RETURN(0); } |