summaryrefslogtreecommitdiff
path: root/sql/sql_union.cc
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2003-11-25 23:52:10 +0200
committerunknown <bell@sanja.is.com.ua>2003-11-25 23:52:10 +0200
commitbb6ee17aae881ff42472c9010f940b1ee58b0ca2 (patch)
tree57654cbf83bb033045085463b35b03807b6bfd59 /sql/sql_union.cc
parentc6311f86730475da2f7b32f9a48af9687d1056ad (diff)
downloadmariadb-git-bb6ee17aae881ff42472c9010f940b1ee58b0ca2.tar.gz
added collation processing in UNION merging
temporary table BLOB now is longblob mysql-test/r/create.result: blob size changed for safety mysql-test/r/type_blob.result: blob size changed for safety mysql-test/r/type_ranges.result: blob size changed for safety mysql-test/r/union.result: blob size changed for safety new tests of UNION types merging mysql-test/t/union.test: new tests of UNION types merging sql/field.h: blob size changed for safety sql/item.cc: processing of collation added added comment sql/item.h: joining of UNION fields may failed now, because of incompatibility of collations sql/sql_union.cc: joining of UNION fields may failed now, because of incompatibility of collations
Diffstat (limited to 'sql/sql_union.cc')
-rw-r--r--sql/sql_union.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index e2c90e4ff4c..44a30082c0a 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -197,7 +197,8 @@ int st_select_lex_unit::prepare(THD *thd, select_result *sel_result)
Item *type, *item;
while((type= tp++, item= it++))
{
- ((Item_type_holder*)type)->join_types(thd, item);
+ if (((Item_type_holder*)type)->join_types(thd, item))
+ DBUG_RETURN(-1)
}
}
}