diff options
| author | unknown <bar@mysql.com> | 2004-10-19 11:45:33 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2004-10-19 11:45:33 +0500 |
| commit | ad8865cbd7dd4eda775a7abbb7ecaec0b230cfc1 (patch) | |
| tree | 2fa283eb0a7eaebdac20eab0c5af258d31091e3e /sql/sql_union.cc | |
| parent | 234a8ec06113e3b7533c9302a8a1fcbbb18e2fa4 (diff) | |
| download | mariadb-git-ad8865cbd7dd4eda775a7abbb7ecaec0b230cfc1.tar.gz | |
sql_union.cc:
Check DERIVATION_NONE only for UNIONS.
sql/sql_union.cc:
Check DERIVATION_NONE only for UNIONS.
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 6b5d27270c9..fc2d2a3a5e4 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -264,9 +264,14 @@ int st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result, } } + if (first_select->next_select()) { + + // it is not single select + /* - Check that it was possible to aggregate all collations together. + Check that it was possible to aggregate + all collations together for UNION. */ List_iterator_fast<Item> tp(types); Item *type; @@ -279,11 +284,7 @@ int st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result, goto err; } } - } - // it is not single select - if (first_select->next_select()) - { union_result->tmp_table_param.field_count= types.elements; if (!(table= create_tmp_table(thd_arg, &union_result->tmp_table_param, types, |