diff options
| author | knielsen@mysql.com <> | 2006-05-18 11:56:50 +0200 |
|---|---|---|
| committer | knielsen@mysql.com <> | 2006-05-18 11:56:50 +0200 |
| commit | a061c90d8a0675c9336aa2eecb704c0cea2d555b (patch) | |
| tree | 898111e646cb542afbc154fb8cba54d0605e12f7 /sql/field_conv.cc | |
| parent | 0d069edaa2a21b9eaf2dc3bc529fa85644279cdf (diff) | |
| parent | c8fd62f3b2c621610e01787b187485af9dbf70bf (diff) | |
| download | mariadb-git-a061c90d8a0675c9336aa2eecb704c0cea2d555b.tar.gz | |
Merge mysql.com:/usr/local/mysql/tmp_merge
into mysql.com:/usr/local/mysql/merge-5.1
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 f718a3d778c..3eab782d167 100644 --- a/sql/field_conv.cc +++ b/sql/field_conv.cc @@ -641,7 +641,8 @@ void (*Copy_field::get_copy_func(Field *to,Field *from))(Copy_field*) void field_conv(Field *to,Field *from) { - if (to->real_type() == from->real_type()) + if (to->real_type() == from->real_type() && + !(to->type() == FIELD_TYPE_BLOB && to->table->copy_blobs)) { if (to->pack_length() == from->pack_length() && !(to->flags & UNSIGNED_FLAG && !(from->flags & UNSIGNED_FLAG)) && |