diff options
| author | unknown <serg@janus.mylan> | 2007-03-16 20:33:27 +0100 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2007-03-16 20:33:27 +0100 |
| commit | 929b7b1b5ff811d1a06c1c9cea5b58e008e20c8f (patch) | |
| tree | 5c776e7835969b55a2ad2ba1f861c8ad843a8a9d /sql/sql_help.cc | |
| parent | 68f09e779291c0f48bcc79d7699dd708fda32c32 (diff) | |
| parent | a2630174940dfe4be437503eb82d07838b54cda2 (diff) | |
| download | mariadb-git-929b7b1b5ff811d1a06c1c9cea5b58e008e20c8f.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
Diffstat (limited to 'sql/sql_help.cc')
| -rw-r--r-- | sql/sql_help.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_help.cc b/sql/sql_help.cc index 6cb87c7e601..aacfd8f8245 100644 --- a/sql/sql_help.cc +++ b/sql/sql_help.cc @@ -295,8 +295,7 @@ int get_topics_for_keyword(THD *thd, TABLE *topics, TABLE *relations, rkey_id->store((longlong) key_id, TRUE); 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(), + (byte *) buff, (ulonglong)1, HA_READ_KEY_EXACT); for ( ; @@ -310,7 +309,7 @@ int get_topics_for_keyword(THD *thd, TABLE *topics, TABLE *relations, 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)) + (ulonglong)1, HA_READ_KEY_EXACT)) { memorize_variant_topic(thd,topics,count,find_fields, names,name,description,example); |