summaryrefslogtreecommitdiff
path: root/sql/sql_handler.cc
diff options
context:
space:
mode:
authorunknown <timour@mysql.com>2004-10-11 10:47:08 +0300
committerunknown <timour@mysql.com>2004-10-11 10:47:08 +0300
commit16c3b9ae0b1d02430768d098ded031f040a84746 (patch)
tree2d2171e514f0cdbc83a7e6963ba1e79dae224b27 /sql/sql_handler.cc
parentb22298635fa9d61ba480ed8f08da919f46305c90 (diff)
parente8b74f68d82b45084b9719ba15111303dea941c2 (diff)
downloadmariadb-git-16c3b9ae0b1d02430768d098ded031f040a84746.tar.gz
Merge with implementation of WL#1724.
sql/ha_myisam.cc: Auto merged sql/handler.cc: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_sum.cc: Auto merged sql/item_sum.h: Auto merged sql/key.cc: Auto merged sql/mysql_priv.h: Auto merged sql/opt_sum.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_select.h: Auto merged sql/opt_range.cc: Manual merge sql/sql_select.cc: Manual merge
Diffstat (limited to 'sql/sql_handler.cc')
-rw-r--r--sql/sql_handler.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc
index 1443f9f9d5f..38bc4756f81 100644
--- a/sql/sql_handler.cc
+++ b/sql/sql_handler.cc
@@ -337,7 +337,7 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables,
send_error(thd,ER_OUTOFMEMORY);
goto err;
}
- key_copy(key, table, keyno, key_len);
+ key_copy(key, table->record[0], table->key_info + keyno, key_len);
err=table->file->index_read(table->record[0],
key,key_len,ha_rkey_mode);
mode=rkey_to_rnext[(int)ha_rkey_mode];