diff options
author | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
commit | 0accbd0364e0333e0b119aa9ce93e34ded9df6cb (patch) | |
tree | bdf0738c29dc1f57fbfba3a1754524e238f15b52 /sql/records.cc | |
parent | 37f87d73ae8dc6c30594867b40a5d70159acf63c (diff) | |
download | mariadb-git-0accbd0364e0333e0b119aa9ce93e34ded9df6cb.tar.gz |
lots of post-merge changes
Diffstat (limited to 'sql/records.cc')
-rw-r--r-- | sql/records.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/records.cc b/sql/records.cc index a7af42fc86a..ed1edcaf487 100644 --- a/sql/records.cc +++ b/sql/records.cc @@ -30,7 +30,7 @@ #include "filesort.h" // filesort_free_buffers #include "opt_range.h" // SQL_SELECT #include "sql_class.h" // THD - +#include "sql_base.h" static int rr_quick(READ_RECORD *info); int rr_sequential(READ_RECORD *info); @@ -387,7 +387,7 @@ static int rr_index_first(READ_RECORD *info) static int rr_index_last(READ_RECORD *info) { - int tmp= info->file->index_last(info->record); + int tmp= info->file->ha_index_last(info->record); info->read_record= rr_index_desc; if (tmp) tmp= rr_handle_error(info, tmp); @@ -438,7 +438,7 @@ static int rr_index(READ_RECORD *info) static int rr_index_desc(READ_RECORD *info) { - int tmp= info->file->index_prev(info->record); + int tmp= info->file->ha_index_prev(info->record); if (tmp) tmp= rr_handle_error(info, tmp); return tmp; |