diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2014-10-29 15:20:46 +0300 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2014-10-29 15:20:46 +0300 |
| commit | e4521f8cae6134d3c32b2b8cb3e24a54c90de627 (patch) | |
| tree | a110921037bd605d7bba552eedd4dbbaf3cebebc /sql/table.cc | |
| parent | 100b10d8efbcbc936d742b87aacf49dab037333f (diff) | |
| parent | 35f69fc42e4b4004f6972df25669aac3f0782085 (diff) | |
| download | mariadb-git-e4521f8cae6134d3c32b2b8cb3e24a54c90de627.tar.gz | |
Merge
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index 8702c806c48..c84b8ab17f6 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -6080,7 +6080,6 @@ void TABLE::create_key_part_by_field(KEY *keyinfo, Field *field, uint fieldnr) { DBUG_ASSERT(field->field_index + 1 == (int)fieldnr); - field->flags|= PART_KEY_FLAG; key_part_info->null_bit= field->null_bit; key_part_info->null_offset= (uint) (field->null_ptr - (uchar*) record[0]); @@ -6237,6 +6236,7 @@ bool TABLE::add_tmp_key(uint key, uint key_parts, (*reg_field)->key_start.set_bit(key); (*reg_field)->part_of_key.set_bit(key); create_key_part_by_field(keyinfo, key_part_info, *reg_field, fld_idx+1); + (*reg_field)->flags|= PART_KEY_FLAG; key_start= FALSE; key_part_info++; } |