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 | 2b91a639cc767928ca063a466b4058e22f8fb7ff (patch) | |
| tree | 4338d119cdec937cf4940fa680f04b7a3107d4da /sql/sql_select.h | |
| parent | 2ae359db4ade9df5e31cb0c0967f097fbd57ca07 (diff) | |
| download | mariadb-git-2b91a639cc767928ca063a466b4058e22f8fb7ff.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
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index 8311d7fdd2b..c725316f4dd 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -134,7 +134,6 @@ enum enum_nested_loop_state typedef enum_nested_loop_state (*Next_select_func)(JOIN *, struct st_join_table *, bool); -typedef int (*Read_record_func)(struct st_join_table *tab); Next_select_func setup_end_select_func(JOIN *join); @@ -162,7 +161,7 @@ typedef struct st_join_table { */ uint packed_info; - Read_record_func read_first_record; + READ_RECORD::Setup_func read_first_record; Next_select_func next_select; READ_RECORD read_record; /* @@ -170,8 +169,8 @@ typedef struct st_join_table { if it is executed by an alternative full table scan when the left operand of the subquery predicate is evaluated to NULL. */ - Read_record_func save_read_first_record;/* to save read_first_record */ - int (*save_read_record) (READ_RECORD *);/* to save read_record.read_record */ + READ_RECORD::Setup_func save_read_first_record;/* to save read_first_record */ + READ_RECORD::Read_func save_read_record;/* to save read_record.read_record */ double worst_seeks; key_map const_keys; /**< Keys with constant part */ key_map checked_keys; /**< Keys checked in find_best */ |