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()

1 files changed, 4 insertions, 4 deletions

diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc
index 1095bb25d0b..7ac555fdbe3 100644
--- a/sql/sql_rename.cc
+++ b/sql/sql_rename.cc
@@ -173,14 +173,14 @@ bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list, bool silent)
     error= 1;
   }
 
-  if (!silent && !error)
+  if (likely(!silent && !error))
   {
     binlog_error= write_bin_log(thd, TRUE, thd->query(), thd->query_length());
-    if (!binlog_error)
+    if (likely(!binlog_error))
       my_ok(thd);
   }
 
-  if (!error)
+  if (likely(!error))
     query_cache_invalidate3(thd, table_list, 0);
 
 err:
@@ -332,7 +332,7 @@ do_rename(THD *thd, TABLE_LIST *ren_table, const LEX_CSTRING *new_db,
   {
     my_error(ER_NO_SUCH_TABLE, MYF(0), ren_table->db.str, old_alias.str);
   }
-  if (rc && !skip_error)
+  if (unlikely(rc && !skip_error))
     DBUG_RETURN(1);
 
   DBUG_RETURN(0);