summaryrefslogtreecommitdiff
path: root/sql/field_conv.cc
diff options
context:
space:
mode:
authorbar@bar.mysql.r18.ru <>2003-07-11 16:11:17 +0500
committerbar@bar.mysql.r18.ru <>2003-07-11 16:11:17 +0500
commitc994482fadd709639073ad2414d6362fa9987adb (patch)
tree107874c5d46a597a704fdb00a3b82a99f3a10f53 /sql/field_conv.cc
parent92b3a231d45928e7de64fa2e8936b877bf6049c4 (diff)
downloadmariadb-git-c994482fadd709639073ad2414d6362fa9987adb.tar.gz
field_conv.cc:
Data was not converted when ALTER TABLE CHAGE changed a field character set.
Diffstat (limited to 'sql/field_conv.cc')
-rw-r--r--sql/field_conv.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/field_conv.cc b/sql/field_conv.cc
index ec2488f520a..144e6d7e74a 100644
--- a/sql/field_conv.cc
+++ b/sql/field_conv.cc
@@ -489,6 +489,8 @@ void (*Copy_field::get_copy_func(Field *to,Field *from))(Copy_field*)
if (!to->eq_def(from))
return do_field_string;
}
+ else if (to->charset() != from->charset())
+ return do_field_string;
else if (to->real_type() == FIELD_TYPE_VAR_STRING && to_length !=
from_length)
return do_varstring;