diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-06-05 20:57:09 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-06-05 20:57:09 +0200 |
| commit | efbab93f047c722352e0d330a109ddca9e82eb97 (patch) | |
| tree | e81cea2fb6232316ac1e0f1a260613a1987ac9e7 /sql/sql_select.cc | |
| parent | fcb68ffe3dfb1c841852bd62a9aac9708888f4e9 (diff) | |
| download | mariadb-git-bb-10.3-MDEV-19698.tar.gz | |
MDEV-19698: Cleanup READ_RECORD::recordbb-10.3-MDEV-19698
https://github.com/MariaDB/server/pull/777#issuecomment-496469366
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index b731b1851fd..eb77276e352 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -20392,7 +20392,6 @@ join_read_first(JOIN_TAB *tab) tab->table->status=0; tab->read_record.read_record_func= join_read_next; tab->read_record.table=table; - tab->read_record.record=table->record[0]; if (!table->file->inited) error= table->file->ha_index_init(tab->index, tab->sorted); if (likely(!error)) @@ -20412,7 +20411,7 @@ static int join_read_next(READ_RECORD *info) { int error; - if (unlikely((error= info->table->file->ha_index_next(info->record)))) + if (unlikely((error= info->table->file->ha_index_next(info->record())))) return report_error(info->table, error); return 0; @@ -20432,7 +20431,6 @@ join_read_last(JOIN_TAB *tab) tab->table->status=0; tab->read_record.read_record_func= join_read_prev; tab->read_record.table=table; - tab->read_record.record=table->record[0]; if (!table->file->inited) error= table->file->ha_index_init(tab->index, 1); if (likely(!error)) @@ -20449,7 +20447,7 @@ static int join_read_prev(READ_RECORD *info) { int error; - if (unlikely((error= info->table->file->ha_index_prev(info->record)))) + if (unlikely((error= info->table->file->ha_index_prev(info->record())))) return report_error(info->table, error); return 0; } @@ -20479,7 +20477,7 @@ static int join_ft_read_next(READ_RECORD *info) { int error; - if (unlikely((error= info->table->file->ha_ft_read(info->table->record[0])))) + if (unlikely((error= info->table->file->ha_ft_read(info->record())))) return report_error(info->table, error); return 0; } |