diff options
Diffstat (limited to 'mysys/ma_dyncol.c')
| -rw-r--r-- | mysys/ma_dyncol.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/mysys/ma_dyncol.c b/mysys/ma_dyncol.c index 8a224f1c5e8..33627b85f92 100644 --- a/mysys/ma_dyncol.c +++ b/mysys/ma_dyncol.c @@ -3853,20 +3853,19 @@ mariadb_dyncol_val_str(DYNAMIC_STRING *str, DYNAMIC_COLUMN_VALUE *val, if (!quote) { /* convert to the destination */ - str->length+= copy_and_convert_extended(str->str, bufflen, - cs, - from, (uint32)len, - val->x.string.charset, - &dummy_errors); + str->length+= my_convert(str->str, bufflen, + cs, + from, (uint32)len, + val->x.string.charset, + &dummy_errors); return ER_DYNCOL_OK; } if ((alloc= (char *)my_malloc(bufflen, MYF(0)))) { - len= - copy_and_convert_extended(alloc, bufflen, cs, - from, (uint32)len, - val->x.string.charset, - &dummy_errors); + len= my_convert(alloc, bufflen, cs, + from, (uint32)len, + val->x.string.charset, + &dummy_errors); from= alloc; } else |