diff options
author | monty@mysql.com <> | 2004-12-06 19:18:35 +0200 |
---|---|---|
committer | monty@mysql.com <> | 2004-12-06 19:18:35 +0200 |
commit | 77207d19f20f21c54b8d5279c6924f4c4bdaaa51 (patch) | |
tree | 44698f6f68c51daacf7552356ae071b8e8fdb035 /sql/sql_help.cc | |
parent | e99d5fee828e40589d7a29b81bba32b53e94037a (diff) | |
parent | 67ce24796584e80cf843b37b09aeb794c9231190 (diff) | |
download | mariadb-git-77207d19f20f21c54b8d5279c6924f4c4bdaaa51.tar.gz |
Merge with new VARCHAR code
Diffstat (limited to 'sql/sql_help.cc')
-rw-r--r-- | sql/sql_help.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sql_help.cc b/sql/sql_help.cc index bcde1dc46f2..f71e9a7133a 100644 --- a/sql/sql_help.cc +++ b/sql/sql_help.cc @@ -286,8 +286,7 @@ int get_topics_for_keyword(THD *thd, TABLE *topics, TABLE *relations, relations->file->ha_index_init(iindex_relations); rkey_id->store((longlong) key_id); - rkey_id->get_key_image(buff, rkey_id->pack_length(), rkey_id->charset(), - Field::itRAW); + rkey_id->get_key_image(buff, rkey_id->pack_length(), Field::itRAW); int key_res= relations->file->index_read(relations->record[0], (byte *)buff, rkey_id->pack_length(), HA_READ_KEY_EXACT); @@ -300,8 +299,7 @@ int get_topics_for_keyword(THD *thd, TABLE *topics, TABLE *relations, longlong topic_id= rtopic_id->val_int(); Field *field= find_fields[help_topic_help_topic_id].field; field->store((longlong) topic_id); - field->get_key_image(topic_id_buff, field->pack_length(), field->charset(), - Field::itRAW); + field->get_key_image(topic_id_buff, field->pack_length(), Field::itRAW); if (!topics->file->index_read(topics->record[0], (byte *)topic_id_buff, field->pack_length(), HA_READ_KEY_EXACT)) |