bzr commit into mysql-5.1-innodb branch (marko.makela:3691) Bug#59486

[marko.makela]

#At file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ based on revid:marko.makela@strippedynezoivygr8t

 3691 Marko Mäkelä	2011-01-25
      Bug#59486 Incorrect usage of UNIV_UNLIKELY() in mlog_parse_string()
      
      mlog_parse_string(): Enclose the comparison in UNIV_UNLIKELY,
      not the comparand.

    modified:
      storage/innodb_plugin/ChangeLog
      storage/innodb_plugin/mtr/mtr0log.c
=== modified file 'storage/innodb_plugin/ChangeLog'
--- a/storage/innodb_plugin/ChangeLog	revid:marko.makela@strippedezoivygr8t
+++ b/storage/innodb_plugin/ChangeLog	revid:marko.makela@stripped
@@ -1,5 +1,10 @@
 2011-01-25	The InnoDB Team
 
+	* mtr/mtr0log.c:
+	Bug#59486 Incorrect usage of UNIV_UNLIKELY() in mlog_parse_string()
+
[phone]	The InnoDB Team
+
 	* row/row0vers.c:
 	Fix Bug#59464 Race condition in row_vers_build_for_semi_consistent_read
 

=== modified file 'storage/innodb_plugin/mtr/mtr0log.c'
--- a/storage/innodb_plugin/mtr/mtr0log.c	revid:marko.makela@stripped95450-cme5ynezoivygr8t
+++ b/storage/innodb_plugin/mtr/mtr0log.c	revid:marko.makela@strippedqrw5558pimj0
@@ -408,7 +408,7 @@ mlog_parse_string(
 	ptr += 2;
 
 	if (UNIV_UNLIKELY(offset >= UNIV_PAGE_SIZE)
-			|| UNIV_UNLIKELY(len + offset) > UNIV_PAGE_SIZE) {
+	    || UNIV_UNLIKELY(len + offset > UNIV_PAGE_SIZE)) {
 		recv_sys->found_corrupt_log = TRUE;
 
 		return(NULL);

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