diff options
| author | Sergey Vojtovich <svoj@sun.com> | 2010-02-09 15:43:44 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@sun.com> | 2010-02-09 15:43:44 +0400 |
| commit | 7feb91e7c56efcb2e9f2020642306bc9223e4f3a (patch) | |
| tree | 3ef4d901c69d0279a7813c57bebf44835c77c2fa /sql/table.cc | |
| parent | 6124451d9534b1a03e58724411c492d9de980cb4 (diff) | |
| parent | 0897669cba1b314c36f41a8a31ee73b6d0d11115 (diff) | |
| download | mariadb-git-7feb91e7c56efcb2e9f2020642306bc9223e4f3a.tar.gz | |
Merge fix for bug49902 to mysql-5.1-bugteam.
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/table.cc b/sql/table.cc index 8a8228b9954..8758596d408 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -4374,7 +4374,7 @@ void st_table::mark_columns_used_by_index(uint index) MY_BITMAP *bitmap= &tmp_set; DBUG_ENTER("st_table::mark_columns_used_by_index"); - (void) file->extra(HA_EXTRA_KEYREAD); + set_keyread(TRUE); bitmap_clear_all(bitmap); mark_columns_used_by_index_no_reset(index, bitmap); column_bitmaps_set(bitmap, bitmap); @@ -4397,8 +4397,7 @@ void st_table::restore_column_maps_after_mark_index() { DBUG_ENTER("st_table::restore_column_maps_after_mark_index"); - key_read= 0; - (void) file->extra(HA_EXTRA_NO_KEYREAD); + set_keyread(FALSE); default_column_bitmaps(); file->column_bitmaps_signal(); DBUG_VOID_RETURN; |