bzr commit into mysql-5.1-telco-6.2 branch (jonas:2919)

[Jonas Oreland]

#At file:///home/jonas/src/telco-6.2/ based on revid:jonas@stripped

 2919 Jonas Oreland	2009-05-09
      fix warnings introduced by not declaring (un)likely
      when compiling debug

    M  sql/handler.cc
    M  sql/sql_partition.cc
    M  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
=== modified file 'sql/handler.cc'
--- a/sql/handler.cc	2009-05-08 14:43:21 +0000
+++ b/sql/handler.cc	2009-05-09 16:00:02 +0000
@@ -4633,9 +4633,9 @@ int handler::ha_write_row(uchar *buf)
 
   mark_trx_read_write();
 
-  if (unlikely(error= write_row(buf)))
+  if (unlikely((error= write_row(buf)) != 0))
     DBUG_RETURN(error);
-  if (unlikely(error= binlog_log_row(table, 0, buf, log_func)))
+  if (unlikely((error= binlog_log_row(table, 0, buf, log_func)) != 0))
     DBUG_RETURN(error); /* purecov: inspected */
   DBUG_RETURN(0);
 }
@@ -4654,9 +4654,9 @@ int handler::ha_update_row(const uchar *
 
   mark_trx_read_write();
 
-  if (unlikely(error= update_row(old_data, new_data)))
+  if (unlikely((error= update_row(old_data, new_data)) != 0))
     return error;
-  if (unlikely(error= binlog_log_row(table, old_data, new_data, log_func)))
+  if (unlikely((error= binlog_log_row(table, old_data, new_data, log_func))!=0))
     return error;
   return 0;
 }
@@ -4668,9 +4668,9 @@ int handler::ha_delete_row(const uchar *
 
   mark_trx_read_write();
 
-  if (unlikely(error= delete_row(buf)))
+  if (unlikely((error= delete_row(buf)) != 0))
     return error;
-  if (unlikely(error= binlog_log_row(table, buf, 0, log_func)))
+  if (unlikely((error= binlog_log_row(table, buf, 0, log_func)) != 0))
     return error;
   return 0;
 }

=== modified file 'sql/sql_partition.cc'
--- a/sql/sql_partition.cc	2009-02-03 14:17:59 +0000
+++ b/sql/sql_partition.cc	2009-05-09 16:00:02 +0000
@@ -320,9 +320,9 @@ int get_parts_for_update(const uchar *ol
   if (new_data == rec0)
 #endif
   {
-    if (unlikely(error= part_info->get_partition_id(part_info,
+    if (unlikely((error= part_info->get_partition_id(part_info,
                                                     new_part_id,
-                                                    new_func_value)))
+                                                     new_func_value)) != 0))
     {
       DBUG_RETURN(error);
     }

=== modified file 'storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2008-08-04 15:49:01 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2009-05-09 16:00:02 +0000
@@ -1561,12 +1561,12 @@ int Dbtup::handleInsertReq(Signal* signa
     }
 
     if (regTabPtr->need_shrink() && cmp[0] != cmp[1] &&
-	unlikely(ret = handle_size_change_after_update(req_struct,
-						       base,
-						       regOperPtr.p,
-						       regFragPtr,
-						       regTabPtr,
-						       sizes)))
+	unlikely(handle_size_change_after_update(req_struct,
+                                                 base,
+                                                 regOperPtr.p,
+                                                 regFragPtr,
+                                                 regTabPtr,
+                                                 sizes) != 0))
     {
       goto size_change_error;
     }


Attachment: [text/bzr-bundle] bzr/[e-mail]