diff options
author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-27 14:48:50 +0400 |
---|---|---|
committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-27 14:48:50 +0400 |
commit | eaea879db3641c6fecdd36477537ff6c5ec35f8b (patch) | |
tree | ca59e8dad6a42a883f6e038f21435facdec68fb4 /sql/table.cc | |
parent | 17325b8d6788cfd6f8ff158a6e7e11c7ab9f008e (diff) | |
download | mariadb-git-eaea879db3641c6fecdd36477537ff6c5ec35f8b.tar.gz |
Fixed an incorrect merge from 5.1-bugteam.
Diffstat (limited to 'sql/table.cc')
-rw-r--r-- | sql/table.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/table.cc b/sql/table.cc index 2b6d55d0cb5..12ac8b11f97 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -4445,10 +4445,10 @@ void TABLE::mark_columns_used_by_index(uint index) restore_column_maps_after_mark_index(). */ -void st_table::add_read_columns_used_by_index(uint index) +void TABLE::add_read_columns_used_by_index(uint index) { MY_BITMAP *bitmap= &tmp_set; - DBUG_ENTER("st_table::add_read_columns_used_by_index"); + DBUG_ENTER("TABLE::add_read_columns_used_by_index"); set_keyread(TRUE); bitmap_copy(bitmap, read_set); |