diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-10-16 19:58:26 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-10-16 19:58:26 +0400 |
| commit | f0ccd917cc2643f1f3b4ede4f742f735dfa50552 (patch) | |
| tree | 4338d119cdec937cf4940fa680f04b7a3107d4da /sql/sql_select.cc | |
| parent | abb5e74df6c9198e403cebf4418d17ab71e23352 (diff) | |
| download | mariadb-git-f0ccd917cc2643f1f3b4ede4f742f735dfa50552.tar.gz | |
Backport of:
----------------------------------------------------------
revno: 2630.22.11
committer: Konstantin Osipov <konstantin@mysql.com>
branch nick: mysql-6.0-records
timestamp: Mon 2008-08-11 16:40:09 +0400
message:
Move read_record related functions to a new header - records.h
sql/Makefile.am:
Introduce records.h
sql/handler.h:
Forward-declare class handler (an unnecessary forward declaration
was removed from mysql_priv.h).
sql/item_subselect.cc:
Make read_record function naming more consistent.
Assign read_record function at once, no need to defer till
read_first_record invocation.
sql/mysql_priv.h:
Include records.h, previously part of structs.h
sql/records.cc:
Use records.h
sql/sql_select.h:
Update to use new declarations.
sql/structs.h:
Move declarations of READ_RECORD and related functions to records.h
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 488bd823b6a..9e94bd59bae 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -11881,10 +11881,8 @@ join_init_quick_read_record(JOIN_TAB *tab) } -int rr_sequential(READ_RECORD *info); -int init_read_record_seq(JOIN_TAB *tab) +int read_first_record_seq(JOIN_TAB *tab) { - tab->read_record.read_record= rr_sequential; if (tab->read_record.file->ha_rnd_init(1)) return 1; return (*tab->read_record.read_record)(&tab->read_record); |