diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-01-25 13:19:46 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-01-25 13:19:46 +0200 |
| commit | fbd882fca6902e5038bef1d25c1afbfad892d09a (patch) | |
| tree | 088681536e968628003ae711fd14a8df01b404ac /sql/sql_olap.cc | |
| parent | 433307fafb1bc315a4e92c995f50d052c8d5eb36 (diff) | |
| parent | b23541339c389e452b3d643c249afd4e7fb4899f (diff) | |
| download | mariadb-git-fbd882fca6902e5038bef1d25c1afbfad892d09a.tar.gz | |
merging
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_list.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_olap.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_olap.cc')
| -rw-r--r-- | sql/sql_olap.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_olap.cc b/sql/sql_olap.cc index 1f22073f556..a5f164e1e38 100644 --- a/sql/sql_olap.cc +++ b/sql/sql_olap.cc @@ -164,8 +164,10 @@ int handle_olaps(LEX *lex, SELECT_LEX *select_lex) if (setup_tables((TABLE_LIST *)select_lex->table_list.first) || - setup_fields(lex->thd,(TABLE_LIST *)select_lex->table_list.first,select_lex->item_list,1,&all_fields,1) || - setup_fields(lex->thd,(TABLE_LIST *)select_lex->table_list.first,item_list_copy,1,&all_fields,1)) + setup_fields(lex->thd, 0, (TABLE_LIST *)select_lex->table_list.first, + select_lex->item_list, 1, &all_fields,1) || + setup_fields(lex->thd, 0, (TABLE_LIST *)select_lex->table_list.first, + item_list_copy, 1, &all_fields, 1)) return -1; if (select_lex->olap == CUBE_TYPE) |