diff options
| author | Monty <monty@mariadb.org> | 2018-04-04 12:16:12 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-05-07 00:07:32 +0300 |
| commit | 30ebc3ee9efcab635b1f3e14b9198a58ae93c233 (patch) | |
| tree | 81e3ad66cd4ec8693964317cbf23515d0e9ecf35 /sql/item_strfunc.cc | |
| parent | a22a339f8e044a1e8df011beb0b4c8f43792ac96 (diff) | |
| download | mariadb-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/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index d84e5ad61f6..8df4e72462d 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -4918,7 +4918,7 @@ longlong Item_dyncol_get::val_int() char *end= val.x.string.value.str + val.x.string.value.length, *org_end= end; num= my_strtoll10(val.x.string.value.str, &end, &error); - if (end != org_end || error > 0) + if (unlikely(end != org_end || error > 0)) { push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, ER_BAD_DATA, |