bzr push into mysql-5.1-telco-7.0 branch (ole.john.aske:2879 to 2880) Bug#44570

[Ole John Aske]

 2880 Ole John Aske	2009-05-04
      Fix bug#44570, after merge to resolve conflicts
     @ storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
        Had to change usage of unlikely() to avoide compiler error

    modified:
      include/my_global.h
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
 2879 Ole John Aske	2009-04-30 [merge]
      Fix bug#44570

    modified:
      include/my_global.h
=== modified file 'include/my_global.h'
--- a/include/my_global.h	2009-04-30 08:45:04 +0000
+++ b/include/my_global.h	2009-05-04 10:09:39 +0000
@@ -162,10 +162,10 @@
 #else
 /*
   No branch hinting in DEBUG as this enables warning in case
-  of malformed predicates: ie. use of '=' instead if '=='
+  of malformed predicates: ie. use of '=' instead of '=='
 */
-#define likely(x)	(x)
-#define unlikely(x)	(x)
+#define likely(x)	x
+#define unlikely(x)	x
 #endif
 
 /*

=== modified file 'storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2008-12-09 17:02:23 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2009-05-04 10:09:39 +0000
@@ -1534,7 +1534,7 @@ int Dbtup::handleInsertReq(Signal* signa
     }
 
     if (regTabPtr->need_shrink() && cmp[0] != cmp[1] &&
-	unlikely(ret = handle_size_change_after_update(req_struct,
+	unlikely(handle_size_change_after_update(req_struct,
 						       base,
 						       regOperPtr.p,
 						       regFragPtr,


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