diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-11-25 23:52:10 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-11-25 23:52:10 +0200 |
| commit | bb6ee17aae881ff42472c9010f940b1ee58b0ca2 (patch) | |
| tree | 57654cbf83bb033045085463b35b03807b6bfd59 /sql/item.h | |
| parent | c6311f86730475da2f7b32f9a48af9687d1056ad (diff) | |
| download | mariadb-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/item.h')
| -rw-r--r-- | sql/item.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index c79964f5811..23b0cf018e1 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1005,7 +1005,7 @@ public: double val(); longlong val_int(); String *val_str(String*); - void join_types(THD *thd, Item *); + bool join_types(THD *thd, Item *); Field *example() { return field_example; } }; |