summaryrefslogtreecommitdiff
path: root/sql/datadict.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/datadict.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/datadict.cc')
-rw-r--r--sql/datadict.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/datadict.cc b/sql/datadict.cc
index 4e18fe06cb6..410dbff8778 100644
--- a/sql/datadict.cc
+++ b/sql/datadict.cc
@@ -89,10 +89,10 @@ Table_type dd_frm_type(THD *thd, char *path, LEX_CSTRING *engine_name,
((char*) (engine_name->str))[0]= 0;
}
- if ((error= mysql_file_read(file, (uchar*) header, sizeof(header), MYF(MY_NABP))))
+ if (unlikely((error= mysql_file_read(file, (uchar*) header, sizeof(header), MYF(MY_NABP)))))
goto err;
- if (!strncmp((char*) header, "TYPE=VIEW\n", 10))
+ if (unlikely((!strncmp((char*) header, "TYPE=VIEW\n", 10))))
{
type= TABLE_TYPE_VIEW;
goto err;