diff options
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index a8eb7360339..2e076af45eb 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -846,7 +846,7 @@ outp: with optional left padding (for binary -> UCS2 conversion) SYNOPSIS - well_formed_copy_nhars() + well_formed_copy_nchars() to Store result here to_length Maxinum length of "to" string to_cs Character set of "to" string @@ -983,7 +983,10 @@ outp: goto outp; } else + { + from= from_prev; break; + } } *from_end_pos= from; res= to - to_start; |