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, 2 insertions, 7 deletions

diff --git a/sql/sql_tablespace.cc b/sql/sql_tablespace.cc
index 93a3007d1ea..d97d50912e6 100644
--- a/sql/sql_tablespace.cc
+++ b/sql/sql_tablespace.cc
@@ -46,21 +46,16 @@ int mysql_alter_tablespace(THD *thd, st_alter_tablespace *ts_info)
 
   if (hton->alter_tablespace)
   {
-    if ((error= hton->alter_tablespace(hton, thd, ts_info)))
+    if (unlikely((error= hton->alter_tablespace(hton, thd, ts_info))))
     {
       if (error == 1)
-      {
         DBUG_RETURN(1);
-      }
 
       if (error == HA_ADMIN_NOT_IMPLEMENTED)
-      {
         my_error(ER_CHECK_NOT_IMPLEMENTED, MYF(0), "");
-      }
       else
-      {
         my_error(error, MYF(0));
-      }
+
       DBUG_RETURN(error);
     }
   }