summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.cc
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2021-10-11 09:27:38 +0200
committerVladislav Vaintroub <wlad@mariadb.com>2021-10-14 12:13:05 +0200
commitbc09362eb312eff5eb2203963d75f368fea3f4ad (patch)
treee67fcdf370ea268ddf40b5c95b42a3ad4ecf5024 /sql/item_strfunc.cc
parent5b5a67b2a9aecdc41b35b5cb12ebbf960384f7bd (diff)
downloadmariadb-git-bc09362eb312eff5eb2203963d75f368fea3f4ad.tar.gz
MDEV-26796 Natural sort does not work for utf32/utf16/ucs2
Fixed typo, added test.
Diffstat (limited to 'sql/item_strfunc.cc')
-rw-r--r--sql/item_strfunc.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index f43115fef54..a13728295b8 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -5657,7 +5657,7 @@ String *Item_func_natural_sort_key::val_str(String *out)
*/
if (cs->mbminlen != 1)
{
- if (!tmp.copy(in, &my_charset_utf8mb4_bin, &errs))
+ if (tmp.copy(in, &my_charset_utf8mb4_bin, &errs))
goto error_exit;
in= &tmp;
}