Fixed an incorrect merge from 5.1-bugteam.

eaea879d · Alexey Kopytov · 17325b8d · eaea879d
Commit eaea879d authored May 27, 2010 by Alexey Kopytov
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/table.cc sql/table.cc +2 -2

No files found.
--- 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);