diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2011-01-25 12:17:28 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2011-01-25 12:17:28 +0200 |
| commit | a1e4785a83c3d67f60350524d3c6f567606c2839 (patch) | |
| tree | 6c95de77b926643ef3352e011d9daaac62cda05f /storage | |
| parent | 939088d37fb16c79eb13b6f283b95d323d835582 (diff) | |
| download | mariadb-git-a1e4785a83c3d67f60350524d3c6f567606c2839.tar.gz | |
Bug#59486 Incorrect usage of UNIV_UNLIKELY() in mlog_parse_string()
mlog_parse_string(): Enclose the comparison in UNIV_UNLIKELY,
not the comparand.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innodb_plugin/ChangeLog | 5 | ||||
| -rw-r--r-- | storage/innodb_plugin/mtr/mtr0log.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/storage/innodb_plugin/ChangeLog b/storage/innodb_plugin/ChangeLog index d5e9a6bc825..cac72fd3075 100644 --- a/storage/innodb_plugin/ChangeLog +++ b/storage/innodb_plugin/ChangeLog @@ -1,5 +1,10 @@ 2011-01-25 The InnoDB Team + * mtr/mtr0log.c: + Bug#59486 Incorrect usage of UNIV_UNLIKELY() in mlog_parse_string() + +2011-01-25 The InnoDB Team + * row/row0vers.c: Fix Bug#59464 Race condition in row_vers_build_for_semi_consistent_read diff --git a/storage/innodb_plugin/mtr/mtr0log.c b/storage/innodb_plugin/mtr/mtr0log.c index 3f3dab36b76..3349036b5b3 100644 --- a/storage/innodb_plugin/mtr/mtr0log.c +++ b/storage/innodb_plugin/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); |