diff options
| author | unknown <jani@ibmlab.site> | 2006-03-14 17:46:25 +0200 |
|---|---|---|
| committer | unknown <jani@ibmlab.site> | 2006-03-14 17:46:25 +0200 |
| commit | efa4f8a8baeeedb67d9d53eaca2d11bcbc73080b (patch) | |
| tree | ac00213879ceeead94035dedf1074aa6555d5bb0 /sql/field_conv.cc | |
| parent | 890eca75042acf7c23afac107d62b2fad7119cf6 (diff) | |
| download | mariadb-git-efa4f8a8baeeedb67d9d53eaca2d11bcbc73080b.tar.gz | |
Re commit of previous fix as the bk tree was broken.
Diffstat (limited to 'sql/field_conv.cc')
| -rw-r--r-- | sql/field_conv.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field_conv.cc b/sql/field_conv.cc index 0c385efd10b..f718a3d778c 100644 --- a/sql/field_conv.cc +++ b/sql/field_conv.cc @@ -593,7 +593,7 @@ void (*Copy_field::get_copy_func(Field *to,Field *from))(Copy_field*) do_cut_string : do_cut_string_complex); else if (to_length > from_length) { - if ((to->flags & BINARY_FLAG) != 0) + if (to->charset() == &my_charset_bin) return do_expand_binary; else return do_expand_string; |