diff options
| author | unknown <jimw@mysql.com> | 2005-01-18 13:59:55 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-01-18 13:59:55 -0800 |
| commit | 2c41e5924ee553ce9b728d9b3f2bd1dd7a3c350b (patch) | |
| tree | 6375cf7b1ce711fb0c5cc7f6db4e6349fd766e49 /sql/field_conv.cc | |
| parent | dabd01935c5eddecb7b9691fb9d8b1f474526b74 (diff) | |
| parent | d2778647ae0679dff623a20419c302bad551e9aa (diff) | |
| download | mariadb-git-2c41e5924ee553ce9b728d9b3f2bd1dd7a3c350b.tar.gz | |
Merge from 4.1.
mysql-test/r/type_float.result:
Auto merged
mysql-test/t/type_float.test:
Auto merged
sql/field_conv.cc:
Auto merged
sql/table.cc:
Merge warning of multi-byte charset being applied
to table of unknown charset.
Diffstat (limited to 'sql/field_conv.cc')
| -rw-r--r-- | sql/field_conv.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/field_conv.cc b/sql/field_conv.cc index b337ccd6306..07cc90283b7 100644 --- a/sql/field_conv.cc +++ b/sql/field_conv.cc @@ -584,6 +584,7 @@ void field_conv(Field *to,Field *from) if (to->real_type() == from->real_type()) { if (to->pack_length() == from->pack_length() && + !(to->flags & UNSIGNED_FLAG && !(from->flags & UNSIGNED_FLAG)) && to->real_type() != FIELD_TYPE_ENUM && to->real_type() != FIELD_TYPE_SET && from->charset() == to->charset() && |