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 | fa6c950d38eef84ff41e468b3770d5f6d8b00578 (patch) | |
| tree | 7aee99151209c7e83d2cf2ec0b242e6827f8c55f /sql/sql_derived.cc | |
| parent | 3122cbae39bf0ffa8c727171cbb78ea3ca039fb6 (diff) | |
| parent | fd4b3c6c1c7ee47af58e9abd84818809053b7c86 (diff) | |
| download | mariadb-git-fa6c950d38eef84ff41e468b3770d5f6d8b00578.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index e86ae52e501..47bc13beb53 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -285,13 +285,13 @@ bool mysql_derived_filling(THD *thd, LEX *lex, TABLE_LIST *orig_table_list) lex->current_select= first_select; res= mysql_select(thd, &first_select->ref_pointer_array, - (TABLE_LIST*) first_select->table_list.first, + first_select->table_list.first, first_select->with_wild, first_select->item_list, first_select->where, (first_select->order_list.elements+ first_select->group_list.elements), - (ORDER *) first_select->order_list.first, - (ORDER *) first_select->group_list.first, + first_select->order_list.first, + first_select->group_list.first, first_select->having, (ORDER*) NULL, (first_select->options | thd->variables.option_bits | SELECT_NO_UNLOCK), |