diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-10 22:30:49 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-10 22:30:49 -0300 |
| commit | db2fe44c844e969405095220287ea98a57f33284 (patch) | |
| tree | 7aee99151209c7e83d2cf2ec0b242e6827f8c55f /sql/sql_olap.cc | |
| parent | 90343dd788471cbc384f7f11b7d48fc474ece4c5 (diff) | |
| parent | 0f9ddfa9d8bb8d071266bcc63e92813cf18ccd2b (diff) | |
| download | mariadb-git-db2fe44c844e969405095220287ea98a57f33284.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'sql/sql_olap.cc')
| -rw-r--r-- | sql/sql_olap.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_olap.cc b/sql/sql_olap.cc index cdfa5e3f496..b957d1e9be4 100644 --- a/sql/sql_olap.cc +++ b/sql/sql_olap.cc @@ -147,14 +147,14 @@ int handle_olaps(LEX *lex, SELECT_LEX *select_lex) lex->last_selects=select_lex; - for (ORDER *order=(ORDER *)select_lex->group_list.first ; order ; order=order->next) + for (ORDER *order= select_lex->group_list.first ; order ; order=order->next) item_list_copy.push_back(*(order->item)); List<Item> all_fields(select_lex->item_list); if (setup_tables(lex->thd, &select_lex->context, &select_lex->top_join_list, - (TABLE_LIST *)select_lex->table_list.first + select_lex->table_list.first &select_lex->leaf_tables, FALSE) || setup_fields(lex->thd, 0, select_lex->item_list, MARK_COLUMNS_READ, &all_fields,1) || |