summaryrefslogtreecommitdiff
path: root/sql/field.h
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/field.h
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/field.h')
-rw-r--r--sql/field.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h
index cb44ab76439..0b6ba7dde09 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -941,7 +941,7 @@ public:
struct st_table *table_arg, CHARSET_INFO *cs)
:Field_str((char*) 0,len_arg, maybe_null_arg ? (uchar*) "": 0,0,
NONE, field_name_arg, table_arg, cs),
- geom_flag(true), packlength(3)
+ geom_flag(true), packlength(4)
{
flags|= BLOB_FLAG;
}