diff options
| author | unknown <jani@linux-th5m.site> | 2007-05-24 19:47:58 +0300 |
|---|---|---|
| committer | unknown <jani@linux-th5m.site> | 2007-05-24 19:47:58 +0300 |
| commit | 635728a6e69f95c0a4008fb4b65992d58486bc51 (patch) | |
| tree | 2958d280359513f6d2b3ce1f9b1dfd0f818bfb98 /sql/key.cc | |
| parent | 6356f5631c1b6dab40b747abe54797f1779aef80 (diff) | |
| download | mariadb-git-635728a6e69f95c0a4008fb4b65992d58486bc51.tar.gz | |
Merged from main 5.1
Diffstat (limited to 'sql/key.cc')
| -rw-r--r-- | sql/key.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/key.cc b/sql/key.cc index 6626215a72c..fee06ec058f 100644 --- a/sql/key.cc +++ b/sql/key.cc @@ -227,7 +227,7 @@ void key_restore(uchar *to_record, uchar *from_key, KEY *key_info, from_key+= HA_KEY_BLOB_LENGTH; key_length-= HA_KEY_BLOB_LENGTH; field->set_ptr_offset(to_record - field->table->record[0], - (ulong) blob_length, (char*) from_key); + (ulong) blob_length, from_key); length= key_part->length; } else if (key_part->key_part_flag & HA_VAR_LENGTH_PART) @@ -239,7 +239,7 @@ void key_restore(uchar *to_record, uchar *from_key, KEY *key_info, key_length-= HA_KEY_BLOB_LENGTH; length= min(key_length, key_part->length); old_map= dbug_tmp_use_all_columns(field->table, field->table->write_set); - field->set_key_image((char *) from_key, length); + field->set_key_image(from_key, length); dbug_tmp_restore_column_map(field->table->write_set, old_map); from_key+= HA_KEY_BLOB_LENGTH; field->move_field_offset(-ptrdiff); |