summaryrefslogtreecommitdiff
path: root/sql/strfunc.cc
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2018-04-04 12:16:12 +0300
committerMonty <monty@mariadb.org>2018-05-07 00:07:32 +0300
commit30ebc3ee9efcab635b1f3e14b9198a58ae93c233 (patch)
tree81e3ad66cd4ec8693964317cbf23515d0e9ecf35 /sql/strfunc.cc
parenta22a339f8e044a1e8df011beb0b4c8f43792ac96 (diff)
downloadmariadb-git-30ebc3ee9efcab635b1f3e14b9198a58ae93c233.tar.gz
Add likely/unlikely to speed up execution
Added to: - if (error) - Lex - sql_yacc.yy and sql_yacc_ora.yy - In header files to alloc() calls - Added thd argument to thd_net_is_killed()
Diffstat (limited to 'sql/strfunc.cc')
-rw-r--r--sql/strfunc.cc3
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;