diff options
| author | unknown <jimw@mysql.com> | 2005-01-18 12:25:56 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-01-18 12:25:56 -0800 |
| commit | 8e5a74a6b614af7b25aa2df18844389cceba39fe (patch) | |
| tree | 0053b6b41acc951d4dddaf7d370882943642949a /sql/field_conv.cc | |
| parent | ca252acbcd1439eeba5b6098c183ae932de4805e (diff) | |
| parent | 803774958cb576e04213fd9ab14e78d1b588f8fd (diff) | |
| download | mariadb-git-8e5a74a6b614af7b25aa2df18844389cceba39fe.tar.gz | |
Merge changed tests
sql/field_conv.cc:
Auto merged
mysql-test/r/type_float.result:
Merge
mysql-test/t/type_float.test:
Merge
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 61a5a28f47b..8b362bbf807 100644 --- a/sql/field_conv.cc +++ b/sql/field_conv.cc @@ -559,6 +559,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() && |