diff options
| author | unknown <konstantin@mysql.com> | 2005-05-30 20:56:11 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-05-30 20:56:11 +0400 |
| commit | 5cdac9906945bbe7e7bc459c7e042568574102ab (patch) | |
| tree | 4ed95e1092af1922457a7c10ddee5b8e88ecc9e8 /sql/sql_olap.cc | |
| parent | 1c7b61e3aef5227165a9957ead000e67935708b2 (diff) | |
| parent | 78422442df581b736862bd090ab3c18d92e7d324 (diff) | |
| download | mariadb-git-5cdac9906945bbe7e7bc459c7e042568574102ab.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-7306-new
sql/item_subselect.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_olap.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_olap.cc')
| -rw-r--r-- | sql/sql_olap.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_olap.cc b/sql/sql_olap.cc index 8ac0a36b03f..831b15cf7ef 100644 --- a/sql/sql_olap.cc +++ b/sql/sql_olap.cc @@ -153,8 +153,7 @@ int handle_olaps(LEX *lex, SELECT_LEX *select_lex) if (setup_tables(lex->thd, (TABLE_LIST *)select_lex->table_list.first - &select_lex->where, &select_lex->leaf_tables, - FALSE, FALSE) || + &select_lex->where, &select_lex->leaf_tables, FALSE) || 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, |