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, 6 insertions, 5 deletions

diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc
index 43d1c2de7ad..82946709166 100644
--- a/sql/opt_sum.cc
+++ b/sql/opt_sum.cc
@@ -316,7 +316,7 @@ int opt_sum_query(THD *thd,
     else
     {
       error= tl->table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);
-      if(error)
+      if (unlikely(error))
       {
         tl->table->file->print_error(error, MYF(ME_FATALERROR));
         DBUG_RETURN(error);
@@ -400,15 +400,16 @@ int opt_sum_query(THD *thd,
           }
           longlong info_limit= 1;
           table->file->info_push(INFO_KIND_FORCE_LIMIT_BEGIN, &info_limit);
-          if (!(error= table->file->ha_index_init((uint) ref.key, 1)))
+          if (likely(!(error= table->file->ha_index_init((uint) ref.key, 1))))
             error= (is_max ? 
                     get_index_max_value(table, &ref, range_fl) :
                     get_index_min_value(table, &ref, item_field, range_fl,
                                         prefix_len));
 
           /* Verify that the read tuple indeed matches the search key */
-	  if (!error && reckey_in_range(is_max, &ref, item_field->field, 
-			                conds, range_fl, prefix_len))
+	  if (!error &&
+              reckey_in_range(is_max, &ref, item_field->field,
+                              conds, range_fl, prefix_len))
 	    error= HA_ERR_KEY_NOT_FOUND;
           table->file->ha_end_keyread();
           table->file->ha_index_end();
@@ -478,7 +479,7 @@ int opt_sum_query(THD *thd,
     }
   }
 
-  if (thd->is_error())
+  if (unlikely(thd->is_error()))
     DBUG_RETURN(thd->get_stmt_da()->sql_errno());
 
   /*