diff options
| author | monty@mysql.com <> | 2004-12-07 15:47:00 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-12-07 15:47:00 +0200 |
| commit | 563500994a31c2239a7d87ba9c5ea889493e3596 (patch) | |
| tree | b1c918186908fb490aa860c35dc9e2154aa633c8 /sql/field_conv.cc | |
| parent | 77207d19f20f21c54b8d5279c6924f4c4bdaaa51 (diff) | |
| download | mariadb-git-563500994a31c2239a7d87ba9c5ea889493e3596.tar.gz | |
Update results for new varchar handling
Fixed compiler warnings
String results in CREATE ... SELECT are now created as CHAR(0), VARCHAR(X) or TEXT() depending on item->max_length
Diffstat (limited to 'sql/field_conv.cc')
| -rw-r--r-- | sql/field_conv.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/field_conv.cc b/sql/field_conv.cc index c4dbb9ab647..f6cc851639a 100644 --- a/sql/field_conv.cc +++ b/sql/field_conv.cc @@ -572,7 +572,8 @@ void field_conv(Field *to,Field *from) Field_blob *blob=(Field_blob*) to; from->val_str(&blob->value); if (!blob->value.is_alloced() && - from->real_type() != FIELD_TYPE_STRING) + from->real_type() != MYSQL_TYPE_STRING && + from->real_type() != MYSQL_TYPE_VARCHAR) blob->value.copy(); blob->store(blob->value.ptr(),blob->value.length(),from->charset()); return; |