summaryrefslogtreecommitdiff
path: root/sql/field_conv.cc
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-11-09 03:20:58 +0200
committerunknown <monty@mysql.com>2004-11-09 03:20:58 +0200
commit8e8c1a4756f04b582893965af0b780c2d32536f9 (patch)
treee10c93929aba7853e952fede9fb597042c93d21a /sql/field_conv.cc
parent6fd2435dc31cc6af658747a89aa120f072d30cb5 (diff)
downloadmariadb-git-8e8c1a4756f04b582893965af0b780c2d32536f9.tar.gz
Simple optimization
Diffstat (limited to 'sql/field_conv.cc')
-rw-r--r--sql/field_conv.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/field_conv.cc b/sql/field_conv.cc
index 8a36fcd153c..61a5a28f47b 100644
--- a/sql/field_conv.cc
+++ b/sql/field_conv.cc
@@ -473,9 +473,7 @@ void (*Copy_field::get_copy_func(Field *to,Field *from))(Copy_field*)
{
if (to->flags & BLOB_FLAG)
{
- if (!(from->flags & BLOB_FLAG))
- return do_conv_blob;
- if (from->charset() != to->charset())
+ if (!(from->flags & BLOB_FLAG) || from->charset() != to->charset())
return do_conv_blob;
if (from_length != to_length ||
to->table->db_low_byte_first != from->table->db_low_byte_first)