summaryrefslogtreecommitdiff
path: root/sql/table.cc
diff options
context:
space:
mode:
authorAlexey Kopytov <Alexey.Kopytov@Sun.com>2010-05-27 14:48:50 +0400
committerAlexey Kopytov <Alexey.Kopytov@Sun.com>2010-05-27 14:48:50 +0400
commitd82ce916606ba247638418dd34a9200e50d0670d (patch)
treeca59e8dad6a42a883f6e038f21435facdec68fb4 /sql/table.cc
parent7779b9830cf9aa08a11c8a8340407475a027ac22 (diff)
downloadmariadb-git-d82ce916606ba247638418dd34a9200e50d0670d.tar.gz
Fixed an incorrect merge from 5.1-bugteam.
Diffstat (limited to 'sql/table.cc')
-rw-r--r--sql/table.cc4
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);