3386 Marko Mäkelä 2011-08-18
Fix a regression from WL#5580:
InnoDB would complain about LSN mismatch on compressed pages,
even though there is no second copy of the LSN written on compressed pages.
Noticed by Vasil Dimov when running innodb.innodb_bug56680.
modified:
storage/innobase/buf/buf0flu.c
3385 Georgi Kodinov 2011-08-18
Addendum to the suite for bug #11766001 : 59026: ALLOW MULTIPLE --PLUGIN-LOAD OPTIONS
1. Use the correct case for the mysql.plugin table reference in tests.
2. Add a note into the mysql-test.run.pl docs comments for PLUGVAR_LOAD_ADD.
modified:
mysql-test/include/plugin.defs
mysql-test/r/multi_plugin_load_add.result
mysql-test/r/multi_plugin_load_add2.result
mysql-test/t/multi_plugin_load_add.test
mysql-test/t/multi_plugin_load_add2.test
=== modified file 'storage/innobase/buf/buf0flu.c'
--- a/storage/innobase/buf/buf0flu.c revid:georgi.kodinov@stripped
+++ b/storage/innobase/buf/buf0flu.c revid:marko.makela@oracle.com-20110818102653-h4pw4crgc3s6920r
@@ -1090,8 +1090,10 @@ buf_flush_write_to_dblwr_and_datafile(
/* Check that the page as written to the doublewrite
buffer has sane LSN values. */
- buf_flush_doublewrite_check_page_lsn(
- ((buf_block_t*) bpage)->frame);
+ if (!bpage->zip.data) {
+ buf_flush_doublewrite_check_page_lsn(
+ ((buf_block_t*) bpage)->frame);
+ }
}
retry:
No bundle (reason: useless for push emails).| Thread |
|---|
| • bzr push into mysql-trunk branch (marko.makela:3385 to 3386) WL#5580 | marko.makela | 22 Aug |
