bk commit into 5.1 tree (jani:1.2181)

[jani]

Below is the list of changes that have just been committed into a local
5.1 repository of jani. When jani does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2181 06/03/14 17:46:25 jani@stripped +1 -0
  Re commit of previous fix as the bk tree was broken.

  sql/field_conv.cc
    1.58 06/03/14 17:46:18 jani@stripped +1 -1
    Re commit of previous fix as the bk tree was broken.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jani
# Host:	ibmlab.site
# Root:	/home/my/bk/mysql-5.1-new

--- 1.57/sql/field_conv.cc	2006-03-07 21:00:41 +02:00
+++ 1.58/sql/field_conv.cc	2006-03-14 17:46:18 +02:00
@@ -593,7 +593,7 @@
                 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;