diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-10 12:21:08 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-10 12:21:08 +0200 |
| commit | 65e8506ca9d03967191b6ed207cf107d311f7f99 (patch) | |
| tree | 3076ff798884b52655a5961be21e799708a4b628 /sql/strfunc.cc | |
| parent | 6adfce9c8d2a63a259dd0504600271498dcda228 (diff) | |
| parent | faddcf3c395da640b760c3f701f5bc1f3baae6c4 (diff) | |
| download | mariadb-git-mariadb-10.4.26.tar.gz | |
Merge branch '10.3' into bb-10.4-releasemariadb-10.4.26
Diffstat (limited to 'sql/strfunc.cc')
| -rw-r--r-- | sql/strfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/strfunc.cc b/sql/strfunc.cc index 58647c21e44..8f3ef43ba22 100644 --- a/sql/strfunc.cc +++ b/sql/strfunc.cc @@ -70,7 +70,7 @@ ulonglong find_set(TYPELIB *lib, const char *str, size_t length, CHARSET_INFO *c if ((mblen= cs->cset->mb_wc(cs, &wc, (const uchar *) pos, (const uchar *) end)) < 1) mblen= 1; // Not to hang on a wrong multibyte sequence - if (wc == (my_wc_t) field_separator) + else if (wc == (my_wc_t) field_separator) break; } } |