diff options
| author | Igor Babaev <igor@askmonty.org> | 2018-06-03 10:34:41 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2018-06-03 10:34:41 -0700 |
| commit | cab1d6382623f0611335caf2cd056aa7ee04d7cd (patch) | |
| tree | c33b8118a77a78d87d8fb01e908dbfa6a67ca9a2 /sql/strfunc.cc | |
| parent | ffe83e8e7bef32eb2a80aad2d382f0b023dd3a44 (diff) | |
| parent | ee5124d714ea01f4e1bd6decf6da38b05c1009ad (diff) | |
| download | mariadb-git-cab1d6382623f0611335caf2cd056aa7ee04d7cd.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'sql/strfunc.cc')
| -rw-r--r-- | sql/strfunc.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/strfunc.cc b/sql/strfunc.cc index f701c4a09ed..f457f6b29be 100644 --- a/sql/strfunc.cc +++ b/sql/strfunc.cc @@ -79,8 +79,9 @@ ulonglong find_set(TYPELIB *lib, const char *str, size_t length, CHARSET_INFO *c var_len= (uint) (pos - start); uint find= cs ? find_type2(lib, start, var_len, cs) : find_type(lib, start, var_len, (bool) 0); - if (!find && *err_len == 0) // report the first error with length > 0 + if (unlikely(!find && *err_len == 0)) { + // report the first error with length > 0 *err_pos= (char*) start; *err_len= var_len; *set_warning= 1; |