diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2011-01-25 12:35:35 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2011-01-25 12:35:35 +0200 |
| commit | 12a54ac5d76c4d91a82cf1456d9d7a9ebf4fa6c7 (patch) | |
| tree | 81271bf99aa7724d7d87d326e3784dceb8dddecb /storage/innobase/mtr | |
| parent | 41375b0fa48c3879ee7ecaa5cca0fe8f0fe5fe2e (diff) | |
| parent | 896e0ba4e0304fbd1b056022d8e27f6ce146a83e (diff) | |
| download | mariadb-git-12a54ac5d76c4d91a82cf1456d9d7a9ebf4fa6c7.tar.gz | |
Merge mysql-5.1-innodb to mysql-5.5-innodb.
Diffstat (limited to 'storage/innobase/mtr')
| -rw-r--r-- | storage/innobase/mtr/mtr0log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/mtr/mtr0log.c b/storage/innobase/mtr/mtr0log.c index 04eeb4391cd..864970cef40 100644 --- a/storage/innobase/mtr/mtr0log.c +++ b/storage/innobase/mtr/mtr0log.c @@ -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); |