diff options
Diffstat (limited to 'storage/sequence/sequence.cc')
| -rw-r--r-- | storage/sequence/sequence.cc | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/storage/sequence/sequence.cc b/storage/sequence/sequence.cc index 46dcd2f3296..d0d46495acf 100644 --- a/storage/sequence/sequence.cc +++ b/storage/sequence/sequence.cc @@ -359,18 +359,16 @@ static int dummy_ret_int() { return 0; } class ha_seq_group_by_handler: public group_by_handler { + List<Item> *fields; + TABLE_LIST *table_list; bool first_row; public: ha_seq_group_by_handler(THD *thd_arg, List<Item> *fields_arg, - TABLE_LIST *table_list_arg, ORDER *group_by_arg, - ORDER *order_by_arg, Item *where_arg, - Item *having_arg) - :group_by_handler(thd_arg, fields_arg, table_list_arg, group_by_arg, - order_by_arg, where_arg, having_arg, sequence_hton) {} + TABLE_LIST *table_list_arg) + : group_by_handler(thd_arg, sequence_hton), fields(fields_arg), + table_list(table_list_arg) {} ~ha_seq_group_by_handler() {} - bool init(TABLE *temporary_table, Item *having_arg, - ORDER *order_by_arg); int init_scan() { first_row= 1 ; return 0; } int next_row(); int end_scan() { return 0; } @@ -427,21 +425,10 @@ create_group_by_handler(THD *thd, List<Item> *fields, TABLE_LIST *table_list, } /* Create handler and return it */ - handler= new ha_seq_group_by_handler(thd, fields, table_list, group_by, - order_by, where, having); + handler= new ha_seq_group_by_handler(thd, fields, table_list); return handler; } -bool ha_seq_group_by_handler::init(TABLE *temporary_table, Item *having_arg, - ORDER *order_by_arg) -{ - /* - Here we could add checks if the temporary table was created correctly - */ - return group_by_handler::init(temporary_table, having_arg, order_by_arg); -} - - int ha_seq_group_by_handler::next_row() { List_iterator_fast<Item> it(*fields); |