List:Commits« Previous MessageNext Message »
From:marko.makela Date:January 25 2011 10:52am
Subject:bzr commit into mysql-trunk-innodb branch (marko.makela:3458)
View as plain text  
#At file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ based on revid:marko.makela@strippedwvmr8zv9zwqh

 3458 Marko Mäkelä	2011-01-25 [merge]
      Merge mysql-5.5-innodb to mysql-trunk-innodb.

    modified:
      storage/innobase/mtr/mtr0log.c
=== modified file 'storage/innobase/mtr/mtr0log.c'
--- a/storage/innobase/mtr/mtr0log.c	revid:marko.makela@stripped92438-yv6gwvmr8zv9zwqh
+++ b/storage/innobase/mtr/mtr0log.c	revid:marko.makela@strippedu9wq5c2
@@ -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/marko.makela@oracle.com-20110125105135-g7brpb947u9wq5c2.bundle
Thread
bzr commit into mysql-trunk-innodb branch (marko.makela:3458) marko.makela25 Jan