From cdd9d656b41ada43578feefdcf6f93ad1012c418 Mon Sep 17 00:00:00 2001 From: "bar@mysql.com" <> Date: Tue, 19 Oct 2004 11:45:33 +0500 Subject: [PATCH] sql_union.cc: Check DERIVATION_NONE only for UNIONS. --- sql/sql_union.cc | 11 ++++++----- 1 file 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 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,